Messages in this thread | | | Subject | Re: [2.6 patch] i386: reboot.c cleanups | From | James Bottomley <> | Date | Mon, 27 Dec 2004 10:19:55 -0600 |
| |
On Mon, 2004-12-06 at 01:41 +0100, Adrian Bunk wrote: > The partch below includes the following changes: > - arch/i386/kernel/reboot.c: make reboot_thru_bios static > - arch/i386/mach-visws/reboot.c: remove the unused reboot_thru_bios and > reboot_smp > - arch/i386/mach-voyager/voyager_basic.c: remove the unused reboot_thru_bios > - arch/i386/mach-voyager/voyager_smp.c: remove the unused reboot_smp
The description and the patch below don't match. Do you have the correct patch?
James
> --- linux-2.6.10-rc2-mm4-full/arch/i386/kernel/process.c.old 2004-12-06 01:25:27.000000000 +0100 > +++ linux-2.6.10-rc2-mm4-full/arch/i386/kernel/process.c 2004-12-06 01:25:38.000000000 +0100 > @@ -60,7 +60,7 @@ > > asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); > > -int hlt_counter; > +static int hlt_counter; > > unsigned long boot_option_idle_override = 0; > EXPORT_SYMBOL(boot_option_idle_override); > --- linux-2.6.10-rc2-mm4-full/arch/parisc/kernel/process.c.old 2004-12-06 01:25:55.000000000 +0100 > +++ linux-2.6.10-rc2-mm4-full/arch/parisc/kernel/process.c 2004-12-06 01:26:01.000000000 +0100 > @@ -54,7 +54,7 @@ > #include <asm/uaccess.h> > #include <asm/unwind.h> > > -int hlt_counter; > +static int hlt_counter; > > /* > * Power off function, if any > --- linux-2.6.10-rc2-mm4-full/arch/x86_64/kernel/process.c.old 2004-12-06 01:26:17.000000000 +0100 > +++ linux-2.6.10-rc2-mm4-full/arch/x86_64/kernel/process.c 2004-12-06 01:26:28.000000000 +0100 > @@ -53,7 +53,7 @@ > > unsigned long kernel_thread_flags = CLONE_VM | CLONE_UNTRACED; > > -atomic_t hlt_counter = ATOMIC_INIT(0); > +static atomic_t hlt_counter = ATOMIC_INIT(0); > > unsigned long boot_option_idle_override = 0; > EXPORT_SYMBOL(boot_option_idle_override);
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |