mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: blaisorblade_spam@yahoo.it
To: akpm@osdl.org
Cc: jdike@addtoit.com, linux-kernel@vger.kernel.org,
	user-mode-linux-devel@lists.sourceforge.net, cw@f00f.org,
	blaisorblade_spam@yahoo.it
Subject: [patch 13/20] Uml: revert compile-only changes for other ones
Date: Thu, 04 Nov 2004 00:17:44 +0100	[thread overview]
Message-ID: <20041103231744.CFFC355C81@zion.localdomain> (raw)


I'm reverting the compile-time fixes to replace them with a bigger change,
which also happens to fix the compilation problem. The change is in next
patches.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
---

 vanilla-linux-2.6.9-paolo/arch/um/kernel/process.c |   13 -------------
 1 files changed, 13 deletions(-)

diff -puN arch/um/kernel/process.c~uml-revert-wrong-build-fix arch/um/kernel/process.c
--- vanilla-linux-2.6.9/arch/um/kernel/process.c~uml-revert-wrong-build-fix	2004-11-03 23:45:15.493083424 +0100
+++ vanilla-linux-2.6.9-paolo/arch/um/kernel/process.c	2004-11-03 23:45:15.496082968 +0100
@@ -202,11 +202,6 @@ __uml_setup("nosysemu", nosysemu_cmd_par
 		"    To make it working, you need a kernel patch for your host, too.\n"
 		"    See http://perso.wanadoo.fr/laurent.vivier/UML/ for further information.\n");
 
-/* Ugly hack for now... --cw */
-#ifndef PTRACE_SYSEMU
-#define PTRACE_SYSEMU 31
-#endif
-
 static void __init check_sysemu(void)
 {
 	void *stack;
@@ -216,9 +211,7 @@ static void __init check_sysemu(void)
 		return;
 
 	printk("Checking syscall emulation patch for ptrace...");
-#ifdef CONFIG_MODE_SKAS
 	sysemu_supported = 0;
-#endif /* CONFIG_MODE_SKAS */
 	pid = start_ptraced_child(&stack);
 	if(ptrace(PTRACE_SYSEMU, pid, 0, 0) >= 0) {
 		struct user_regs_struct regs;
@@ -240,23 +233,17 @@ static void __init check_sysemu(void)
 
 		stop_ptraced_child(pid, stack, 0);
 
-#ifdef CONFIG_MODE_SKAS
 		sysemu_supported = 1;
-#endif /* CONFIG_MODE_SKAS */
 		printk("found\n");
 	}
 	else
 	{
 		stop_ptraced_child(pid, stack, 1);
-#ifdef CONFIG_MODE_SKAS
 		sysemu_supported = 0;
-#endif /* CONFIG_MODE_SKAS */
 		printk("missing\n");
 	}
 
-#ifdef CONFIG_MODE_SKAS
 	set_using_sysemu(!force_sysemu_disabled);
-#endif
 }
 
 void __init check_ptrace(void)
_

                 reply	other threads:[~2004-11-04  2:06 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20041103231744.CFFC355C81@zion.localdomain \
    --to=blaisorblade_spam@yahoo.it \
    --cc=akpm@osdl.org \
    --cc=cw@f00f.org \
    --cc=jdike@addtoit.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®