From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org,
James.Bottomley@HansenPartnership.com, pazke@donpac.ru,
linux-visws-devel@lists.sf.net
Subject: [2.6 patch] i386: reboot.c cleanups (fwd)
Date: Sun, 16 Jan 2005 03:01:13 +0100 [thread overview]
Message-ID: <20050116020113.GF4274@stusta.de> (raw)
The patch forwarded below still applies and compiles against
2.6.11-rc1-mm1.
Please apply.
----- Forwarded message from Adrian Bunk <bunk@stusta.de> -----
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;
-
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/
----- End forwarded message -----
reply other threads:[~2005-01-16 2:01 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=20050116020113.GF4274@stusta.de \
--to=bunk@stusta.de \
--cc=James.Bottomley@HansenPartnership.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-visws-devel@lists.sf.net \
--cc=pazke@donpac.ru \
/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