* [2.6 patch] i386: reboot.c cleanups
@ 2004-12-06 0:41 Adrian Bunk
2004-12-06 12:23 ` Andrey Panin
2004-12-27 16:19 ` James Bottomley
0 siblings, 2 replies; 5+ messages in thread
From: Adrian Bunk @ 2004-12-06 0:41 UTC (permalink / raw)
To: linux-kernel; +Cc: pazke, linux-visws-devel, James.Bottomley
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
diffstat output:
arch/i386/kernel/reboot.c | 2 +-
arch/i386/mach-visws/reboot.c | 3 ---
arch/i386/mach-voyager/voyager_basic.c | 2 --
arch/i386/mach-voyager/voyager_smp.c | 2 --
4 files changed, 1 insertion(+), 8 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- 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);
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [2.6 patch] i386: reboot.c cleanups
2004-12-06 0:41 [2.6 patch] i386: reboot.c cleanups Adrian Bunk
@ 2004-12-06 12:23 ` Andrey Panin
2004-12-06 13:15 ` Adrian Bunk
2004-12-27 16:19 ` James Bottomley
1 sibling, 1 reply; 5+ messages in thread
From: Andrey Panin @ 2004-12-06 12:23 UTC (permalink / raw)
To: Adrian Bunk; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2587 bytes --]
On 341, 12 06, 2004 at 01:41:27AM +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
Look like "i386/x86_64/parisc process.c: make hlt_counter static" patch
attached instead of promised :)
> diffstat output:
> arch/i386/kernel/reboot.c | 2 +-
> arch/i386/mach-visws/reboot.c | 3 ---
> arch/i386/mach-voyager/voyager_basic.c | 2 --
> arch/i386/mach-voyager/voyager_smp.c | 2 --
> 4 files changed, 1 insertion(+), 8 deletions(-)
>
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> --- 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/
>
--
Andrey Panin | Linux and UNIX system administrator
pazke@donpac.ru | PGP key: wwwkeys.pgp.net
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [2.6 patch] i386: reboot.c cleanups
2004-12-06 12:23 ` Andrey Panin
@ 2004-12-06 13:15 ` Adrian Bunk
0 siblings, 0 replies; 5+ messages in thread
From: Adrian Bunk @ 2004-12-06 13:15 UTC (permalink / raw)
To: linux-kernel
On Mon, Dec 06, 2004 at 03:23:20PM +0300, Andrey Panin wrote:
> On 341, 12 06, 2004 at 01:41:27AM +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
>
> Look like "i386/x86_64/parisc process.c: make hlt_counter static" patch
> attached instead of promised :)
>...
Ups, sorry.
Correct patch below.
<-- snip -->
The patch 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
diffstat output:
arch/i386/kernel/reboot.c | 2 +-
arch/i386/mach-visws/reboot.c | 3 ---
arch/i386/mach-voyager/voyager_basic.c | 2 --
arch/i386/mach-voyager/voyager_smp.c | 2 --
4 files changed, 1 insertion(+), 8 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc2-mm4-full/arch/i386/mach-visws/reboot.c.old 2004-12-06 01:27:17.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/arch/i386/mach-visws/reboot.c 2004-12-06 01:27:44.000000000 +0100
@@ -8,9 +8,6 @@
void (*pm_power_off)(void);
-int reboot_thru_bios;
-int reboot_smp;
-
void machine_restart(char * __unused)
{
#ifdef CONFIG_SMP
--- linux-2.6.10-rc2-mm4-full/arch/i386/mach-voyager/voyager_basic.c.old 2004-12-06 01:28:03.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/arch/i386/mach-voyager/voyager_basic.c 2004-12-06 01:28:12.000000000 +0100
@@ -36,8 +36,6 @@
*/
void (*pm_power_off)(void);
-int reboot_thru_bios;
-
int voyager_level = 0;
struct voyager_SUS *voyager_SUS = NULL;
--- linux-2.6.10-rc2-mm4-full/arch/i386/mach-voyager/voyager_smp.c.old 2004-12-06 01:28:20.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/arch/i386/mach-voyager/voyager_smp.c 2004-12-06 01:28:25.000000000 +0100
@@ -32,8 +32,6 @@
#include <linux/irq.h>
-int reboot_smp = 0;
-
/* TLB state -- visible externally, indexed physically */
DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate) ____cacheline_aligned = { &init_mm, 0 };
--- linux-2.6.10-rc2-mm4-full/arch/i386/kernel/reboot.c.old 2004-12-06 01:28:33.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/arch/i386/kernel/reboot.c 2004-12-06 01:28:43.000000000 +0100
@@ -20,7 +20,7 @@
void (*pm_power_off)(void);
static int reboot_mode;
-int reboot_thru_bios;
+static int reboot_thru_bios;
#ifdef CONFIG_SMP
static int reboot_cpu = -1;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [2.6 patch] i386: reboot.c cleanups
2004-12-06 0:41 [2.6 patch] i386: reboot.c cleanups Adrian Bunk
2004-12-06 12:23 ` Andrey Panin
@ 2004-12-27 16:19 ` James Bottomley
2004-12-27 16:29 ` Adrian Bunk
1 sibling, 1 reply; 5+ messages in thread
From: James Bottomley @ 2004-12-27 16:19 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Linux Kernel, pazke, linux-visws-devel
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);
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [2.6 patch] i386: reboot.c cleanups
2004-12-27 16:19 ` James Bottomley
@ 2004-12-27 16:29 ` Adrian Bunk
0 siblings, 0 replies; 5+ messages in thread
From: Adrian Bunk @ 2004-12-27 16:29 UTC (permalink / raw)
To: James Bottomley; +Cc: Linux Kernel, pazke, linux-visws-devel
On Mon, Dec 27, 2004 at 10:19:55AM -0600, James Bottomley wrote:
> 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?
It's below.
> James
<-- snip -->
Date: Mon, 6 Dec 2004 14:15:09 +0100
From: Adrian Bunk <bunk@stusta.de>
To: linux-kernel@vger.kernel.org
Subject: [2.6 patch] i386: reboot.c cleanups
On Mon, Dec 06, 2004 at 03:23:20PM +0300, Andrey Panin wrote:
> On 341, 12 06, 2004 at 01:41:27AM +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
>
> Look like "i386/x86_64/parisc process.c: make hlt_counter static" patch
> attached instead of promised :)
>...
Ups, sorry.
Correct patch below.
<-- snip -->
The patch 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
diffstat output:
arch/i386/kernel/reboot.c | 2 +-
arch/i386/mach-visws/reboot.c | 3 ---
arch/i386/mach-voyager/voyager_basic.c | 2 --
arch/i386/mach-voyager/voyager_smp.c | 2 --
4 files changed, 1 insertion(+), 8 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc2-mm4-full/arch/i386/mach-visws/reboot.c.old 2004-12-06 01:27:17.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/arch/i386/mach-visws/reboot.c 2004-12-06 01:27:44.000000000 +0100
@@ -8,9 +8,6 @@
void (*pm_power_off)(void);
-int reboot_thru_bios;
-int reboot_smp;
-
void machine_restart(char * __unused)
{
#ifdef CONFIG_SMP
--- linux-2.6.10-rc2-mm4-full/arch/i386/mach-voyager/voyager_basic.c.old 2004-12-06 01:28:03.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/arch/i386/mach-voyager/voyager_basic.c 2004-12-06 01:28:12.000000000 +0100
@@ -36,8 +36,6 @@
*/
void (*pm_power_off)(void);
-int reboot_thru_bios;
-
int voyager_level = 0;
struct voyager_SUS *voyager_SUS = NULL;
--- linux-2.6.10-rc2-mm4-full/arch/i386/mach-voyager/voyager_smp.c.old 2004-12-06 01:28:20.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/arch/i386/mach-voyager/voyager_smp.c 2004-12-06 01:28:25.000000000 +0100
@@ -32,8 +32,6 @@
#include <linux/irq.h>
-int reboot_smp = 0;
-
/* TLB state -- visible externally, indexed physically */
DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate) ____cacheline_aligned = { &init_mm, 0 };
--- linux-2.6.10-rc2-mm4-full/arch/i386/kernel/reboot.c.old 2004-12-06 01:28:33.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/arch/i386/kernel/reboot.c 2004-12-06 01:28:43.000000000 +0100
@@ -20,7 +20,7 @@
void (*pm_power_off)(void);
static int reboot_mode;
-int reboot_thru_bios;
+static int reboot_thru_bios;
#ifdef CONFIG_SMP
static int reboot_cpu = -1;
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2004-12-27 16:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-12-06 0:41 [2.6 patch] i386: reboot.c cleanups Adrian Bunk
2004-12-06 12:23 ` Andrey Panin
2004-12-06 13:15 ` Adrian Bunk
2004-12-27 16:19 ` James Bottomley
2004-12-27 16:29 ` Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).