Merge bk://linux-dj.bkbits.net/agpgart

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge bk://linux-dj.bkbits.net/agpgart
into home.transmeta.com:/home/torvalds/v2.5/linux
a3d9fcff · Linus Torvalds · 5449586c · 4c17e91a · a3d9fcff · a3d9fcff
Commit a3d9fcff authored Jun 10, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

arch/alpha/Kconfig arch/alpha/Kconfig +1 -1

include/linux/reboot.h include/linux/reboot.h +1 -0

kernel/sys.c kernel/sys.c +4 -2

No files found.
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -297,7 +297,7 @@ config PCI

 config PCI_DOMAINS
 	bool
-	default PCI
+	default y

 config ALPHA_CORE_AGP
 	bool

--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -9,6 +9,7 @@
 #define	LINUX_REBOOT_MAGIC2	672274793
 #define	LINUX_REBOOT_MAGIC2A	85072278
 #define	LINUX_REBOOT_MAGIC2B	369367448
+#define	LINUX_REBOOT_MAGIC2C	537993216


 /*

--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -392,8 +392,10 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user

 	/* For safety, we require "magic" arguments. */
 	if (magic1 != LINUX_REBOOT_MAGIC1 ||
-	    (magic2 != LINUX_REBOOT_MAGIC2 && magic2 != LINUX_REBOOT_MAGIC2A &&
-			magic2 != LINUX_REBOOT_MAGIC2B))
+	    (magic2 != LINUX_REBOOT_MAGIC2 &&
+	                magic2 != LINUX_REBOOT_MAGIC2A &&
+			magic2 != LINUX_REBOOT_MAGIC2B &&
+	                magic2 != LINUX_REBOOT_MAGIC2C))
 		return -EINVAL;

 	lock_kernel();