Commit 471417c9 authored by James Bottomley's avatar James Bottomley
Browse files

Merge ../linux-2.6

parents 20e007b8 db29e85a

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com 
D: bug fixes, documentation, minor hackery



N: James Morris

E: jmorris@redhat.com

W: http://www.intercode.com.au/jmorris/

E: jmorris@namei.org

W: http://namei.org/

D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,

D: Crypto API, general networking, miscellaneous.

S: PO Box 707

Documentation/x86_64/boot-options.txt

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ only the AMD64 specific ones are listed here. 
Machine check



   mce=off disable machine check

   mce=bootlog Enable logging of machine checks left over from booting.

               Disabled by default because some BIOS leave bogus ones.

               If your BIOS doesn't do that it's a good idea to enable though

               to make sure you log even machine check events that result

               in a reboot.



   nomce (for compatibility with i386): same as mce=off

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ M: kuznet@ms2.inr.ac.ru 
P:	Pekka Savola (ipv6)

M:	pekkas@netcore.fi

P:	James Morris

M:	jmorris@redhat.com

M:	jmorris@namei.org

P:	Hideaki YOSHIFUJI

M:	yoshfuji@linux-ipv6.org

P:	Patrick McHardy
@@ -2047,7 +2047,7 @@ SELINUX SECURITY MODULE 
P:	Stephen Smalley

M:	sds@epoch.ncsc.mil

P:	James Morris

M:	jmorris@redhat.com

M:	jmorris@namei.org

L:	linux-kernel@vger.kernel.org (kernel issues)

L: 	selinux@tycho.nsa.gov (general discussion)

W:	http://www.nsa.gov/selinux

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 13

EXTRAVERSION =-rc5

EXTRAVERSION =-rc6

NAME=Woozy Numbat



# *DOCUMENTATION*

arch/i386/mach-visws/reboot.c

+10 −1
Original line number Diff line number Diff line
@@ -9,12 +9,15 @@ 
void (*pm_power_off)(void);

EXPORT_SYMBOL(pm_power_off);



void machine_restart(char * __unused)

void machine_shutdown(void)

{

#ifdef CONFIG_SMP

	smp_send_stop();

#endif

}



void machine_emergency_restart(void)

{

	/*

	 * Visual Workstations restart after this

	 * register is poked on the PIIX4
@@ -22,6 +25,12 @@ void machine_restart(char * __unused) 
	outb(PIIX4_RESET_VAL, PIIX4_RESET_PORT);

}



void machine_restart(char * __unused)

{

	machine_shutdown();

	machine_emergency_restart();

}



void machine_power_off(void)

{

	unsigned short pm_status;