Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

22 files changed, 114 insertions, 2027 deletions

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 7ef695981..25b523026 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -85,12 +85,13 @@ endif
 HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
 
 SUBDIRS += arch/i386/kernel arch/i386/mm arch/i386/lib
+
 CORE_FILES := arch/i386/kernel/kernel.o arch/i386/mm/mm.o $(CORE_FILES)
 LIBS := $(TOPDIR)/arch/i386/lib/lib.a $(LIBS) $(TOPDIR)/arch/i386/lib/lib.a
 
 ifdef CONFIG_MATH_EMULATION
 SUBDIRS += arch/i386/math-emu
-DRIVERS += arch/i386/math-emu/math.a
+DRIVERS += arch/i386/math-emu/math.o
 endif
 
 arch/i386/kernel: dummy
diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S
index c52b170ec..adbbcc3c6 100644
--- a/arch/i386/boot/setup.S
+++ b/arch/i386/boot/setup.S
@@ -289,10 +289,11 @@ loader_ok:
 # a whole bunch of different types, and allows memory holes and
 # everything.  We scan through this memory map and build a list
 # of the first 32 memory areas, which we return at [E820MAP].
-#
+# This is documented at http://www.teleport.com/~acpi/acpihtml/topic245.htm
+
+#define SMAP  0x534d4150
 
 meme820:
-	movl	$0x534d4150, %edx		# ascii `SMAP'
 	xorl	%ebx, %ebx			# continuation counter
 	movw	$E820MAP, %di			# point into the whitelist
 						# so we can have the bios
@@ -300,13 +301,14 @@ meme820:
 
 jmpe820:
 	movl	$0x0000e820, %eax		# e820, upper word zeroed
+	movl	$SMAP, %edx			# ascii 'SMAP'
 	movl	$20, %ecx			# size of the e820rec
 	pushw	%ds				# data record.
 	popw	%es
 	int	$0x15				# make the call
 	jc	bail820				# fall to e801 if it fails
 
-	cmpl	$0x534d4150, %eax		# check the return is `SMAP'
+	cmpl	$SMAP, %eax			# check the return is `SMAP'
 	jne	bail820				# fall to e801 if it fails
 
 #	cmpl	$1, 16(%di)			# is this usable memory?
diff --git a/arch/i386/config.in b/arch/i386/config.in
index 87fc106f8..4dc863995 100644
--- a/arch/i386/config.in
+++ b/arch/i386/config.in
@@ -44,6 +44,9 @@ choice 'Processor family' \
 #
 # Define implied options from the CPU selection here
 #
+
+unset CONFIG_X86_FXSR
+
 if [ "$CONFIG_M386" = "y" ]; then
    define_bool CONFIG_X86_CMPXCHG n
    define_int  CONFIG_X86_L1_CACHE_SHIFT 4
@@ -136,7 +139,6 @@ if [ "$CONFIG_MWINCHIP3D" = "y" ]; then
    define_bool CONFIG_X86_ALIGNMENT_16 y
    define_bool CONFIG_X86_TSC y
    define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
-   define_bool CONFIG_X86_USE_3DNOW y
 fi
 tristate 'Toshiba Laptop support' CONFIG_TOSHIBA
 
@@ -162,15 +164,15 @@ fi
 bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR
 bool 'Symmetric multi-processing support' CONFIG_SMP
 if [ "$CONFIG_SMP" != "y" ]; then
-    bool 'APIC and IO-APIC support on uniprocessors' CONFIG_X86_UP_IOAPIC
-    if [ "$CONFIG_X86_UP_IOAPIC" = "y" ]; then
-       define_bool CONFIG_X86_IO_APIC y
-       define_bool CONFIG_X86_LOCAL_APIC y
-    fi
+   bool 'APIC and IO-APIC support on uniprocessors' CONFIG_X86_UP_IOAPIC
+   if [ "$CONFIG_X86_UP_IOAPIC" = "y" ]; then
+      define_bool CONFIG_X86_IO_APIC y
+      define_bool CONFIG_X86_LOCAL_APIC y
+   fi
 fi
 
 if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then
-    define_bool CONFIG_HAVE_DEC_LOCK y
+   define_bool CONFIG_HAVE_DEC_LOCK y
 fi
 endmenu
 
@@ -235,12 +237,8 @@ tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 
 bool 'Power Management support' CONFIG_PM
 
-dep_bool '  ACPI support' CONFIG_ACPI $CONFIG_PM
-if [ "$CONFIG_ACPI" != "n" ]; then
-   if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-      bool '    ACPI interpreter (EXPERIMENTAL)' CONFIG_ACPI_INTERPRETER
-      bool '    Enter S1 for sleep (EXPERIMENTAL)' CONFIG_ACPI_S1_SLEEP
-   fi
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+   dep_bool '  ACPI support' CONFIG_ACPI $CONFIG_PM
 fi
 
 dep_tristate '  Advanced Power Management BIOS support' CONFIG_APM $CONFIG_PM
@@ -278,10 +276,10 @@ comment 'ATA/IDE/MFM/RLL support'
 tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
 
 if [ "$CONFIG_IDE" != "n" ]; then
-  source drivers/ide/Config.in
+   source drivers/ide/Config.in
 else
-  define_bool CONFIG_BLK_DEV_IDE_MODES n
-  define_bool CONFIG_BLK_DEV_HD n
+   define_bool CONFIG_BLK_DEV_IDE_MODES n
+   define_bool CONFIG_BLK_DEV_HD n
 fi
 endmenu
 
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index bdcf8cf6b..de38a46ef 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -92,7 +92,6 @@ CONFIG_BINFMT_AOUT=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=y
 CONFIG_PM=y
-CONFIG_ACPI=y
 # CONFIG_APM is not set
 
 #
@@ -256,6 +255,7 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SD_EXTRA_DEVS=40
 # CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
 # CONFIG_BLK_DEV_SR is not set
 # CONFIG_CHR_DEV_SG is not set
 
@@ -592,8 +592,6 @@ CONFIG_LOCKD=y
 # CONFIG_NCPFS_NFS_NS is not set
 # CONFIG_NCPFS_OS2_NS is not set
 # CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
 # CONFIG_NCPFS_NLS is not set
 # CONFIG_NCPFS_EXTRAS is not set
 
@@ -602,6 +600,7 @@ CONFIG_LOCKD=y
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
+# CONFIG_SMB_NLS is not set
 # CONFIG_NLS is not set
 
 #
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index a8ea61306..67872949d 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -18,7 +18,7 @@ export-objs     := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o
 
 obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
 		ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
-		pci-dma.o i386_ksyms.o i387.o bluesmoke.o
+		pci-dma.o i386_ksyms.o i387.o bluesmoke.o dmi_scan.o
 
 
 ifdef CONFIG_PCI
@@ -41,14 +41,4 @@ obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o
 obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o mpparse.o
 obj-$(CONFIG_X86_VISWS_APIC)	+= visws_apic.o
 
-# if the interpreter is used, it overrides acpi.c
-ifneq ($(CONFIG_ACPI_INTERPRETER),y)
-obj-$(CONFIG_ACPI)	+= acpi.o
-endif
-
-O_OBJS		:= $(filter-out	$(export-objs), $(obj-y))
-OX_OBJS		:= $(filter	$(export-objs), $(obj-y))
-M_OBJS		:= $(sort $(filter-out	$(export-objs), $(obj-m)))
-MX_OBJS		:= $(sort $(filter	$(export-objs), $(obj-m)))
-
 include $(TOPDIR)/Rules.make
diff --git a/arch/i386/kernel/acpi.c b/arch/i386/kernel/acpi.c
deleted file mode 100644
index 98079f060..000000000
--- a/arch/i386/kernel/acpi.c
+++ /dev/null
@@ -1,1935 +0,0 @@
-/*
- *  acpi.c - Linux ACPI driver
- *
- *  Copyright (C) 1999-2000 Andrew Henroid
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/*
- * See http://www.geocities.com/SiliconValley/Hardware/3165/
- * for the user-level ACPI stuff
- *
- * Changes:
- * Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 2000/08/31
- * - check copy*user return
- * - get rid of check_region
- * - get rid of verify_area
- * Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 2000/09/28
- * - do proper release on failure in acpi_claim_ioports and acpi_init
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/miscdevice.h>
-#include <linux/sched.h>
-#include <linux/time.h>
-#include <linux/wait.h>
-#include <linux/spinlock.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-#include <linux/pci.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <linux/sysctl.h>
-#include <linux/delay.h>
-#include <linux/pm.h>
-#include <linux/acpi.h>
-
-/*
- * Yes, it's unfortunate that we are relying on get_cmos_time
- * because it is slow (> 1 sec.) and i386 only.	 It might be better
- * to use some of the code from drivers/char/rtc.c in the near future
- */
-extern unsigned long get_cmos_time(void);
-
-static int acpi_do_ulong(ctl_table *ctl,
-			 int write,
-			 struct file *file,
-			 void *buffer,
-			 size_t *len);
-static int acpi_do_table(ctl_table *ctl,
-			 int write,
-			 struct file *file,
-			 void *buffer,
-			 size_t *len);
-static int acpi_do_event_reg(ctl_table *ctl,
-			     int write,
-			     struct file *file,
-			     void *buffer,
-			     size_t *len);
-static int acpi_do_event(ctl_table *ctl,
-			 int write,
-			 struct file *file,
-			 void *buffer,
-			 size_t *len);
-static int acpi_do_sleep(ctl_table *ctl,
-			 int write,
-			 struct file *file,
-			 void *buffer,
-			 size_t *len);
-static void acpi_release(unsigned long start, unsigned long size);
-
-static struct ctl_table_header *acpi_sysctl = NULL;
-
-// current system sleep state (S0 - S4)
-static acpi_sstate_t acpi_sleep_state = ACPI_S0;
-// time sleep began
-static unsigned long acpi_sleep_start = 0;
-
-static spinlock_t acpi_event_lock = SPIN_LOCK_UNLOCKED;
-static volatile u32 acpi_pm1_status = 0;
-static volatile u32 acpi_gpe_status = 0;
-static volatile u32 acpi_gpe_level = 0;
-static volatile acpi_sstate_t acpi_event_state = ACPI_S0;
-static DECLARE_WAIT_QUEUE_HEAD(acpi_event_wait);
-
-/* Make it impossible to enter C2/C3 until after we've initialized */
-static unsigned long acpi_enter_lvl2_lat = ACPI_INFINITE_LAT;
-static unsigned long acpi_enter_lvl3_lat = ACPI_INFINITE_LAT;
-static unsigned long acpi_p_lvl2_lat = ACPI_INFINITE_LAT;
-static unsigned long acpi_p_lvl3_lat = ACPI_INFINITE_LAT;
-
-/* Statistics.. */
-struct Cx_stat_struct {
-	unsigned long time;
-	unsigned long min;
-	unsigned long max;
-	unsigned long avg;
-} Cx_stat[3];
-
-static int acpi_do_stat(ctl_table *ctl,
-			 int write,
-			 struct file *file,
-			 void *buffer,
-			 size_t *len)
-{
-	int size;
-	char str[4*10];
-	struct Cx_stat_struct *stat = (struct Cx_stat_struct *)ctl->data;
-
-	if (write) {
-		stat->time = 0;
-		stat->min = 0;
-		stat->max = 0;
-		stat->avg = 0;
-		return 0;
-	}
-
-	if (file->f_pos) {
-		*len = 0;
-		return 0;
-	}
-	size = sprintf(str, "%9lu %9lu %9lu %9lu",
-		stat->time,
-		stat->min,
-		stat->max,
-		stat->avg);
-	if (*len < size) {
-		*len = 0;
-		return 0;
-	}
-	return copy_to_user(buffer, str, size) ? -EFAULT : 0;
-}
-
-static void cx_statistics(unsigned int x, unsigned long time)
-{
-	struct Cx_stat_struct *stat = Cx_stat + (x-1);
-
-	stat->time += time;
-	if (time <= stat->min-1)
-		stat->min = time;
-	if (time > stat->max)
-		stat->max = time;
-	stat->avg = time + (stat->avg >> 1);
-}
-
-static unsigned long acpi_p_blk = 0;
-
-static int acpi_p_lvl2_tested = 0;
-static int acpi_p_lvl3_tested = 0;
-
-enum
-{
-	ACPI_ENABLED =       0x00000000, // use ACPI if present
-	ACPI_DISABLED =      0x00000001, // never use ACPI
-	ACPI_TABLES_ONLY =   0x00000002, // never use chipset-specific driver
-	ACPI_CHIPSET_ONLY =  0x00000004, // always use chipset-specific driver
-	ACPI_IGNORE_ERRATA = 0x00000008, // ignore any listed platform errata
-	ACPI_COPY_TABLES  =  0x00000010, // copy ACPI tables before use
-	ACPI_TRUST_TABLES =  0x00000020, // use tables even after ioremap fails
-	ACPI_SCI_DISABLED =  0x00000040, // never enable ACPI (info. only)
-	ACPI_C2_DISABLED  =  0x00000080, // never enter C2
-	ACPI_C3_DISABLED  =  0x00000100, // never enter C3
-	ACPI_S1_DISABLED  =  0x00000200, // never enter S1
-	ACPI_S5_DISABLED  =  0x00000400, // never enter S5
-};
-
-struct acpi_option_info
-{
-	const char *name;
-	unsigned long value;
-};
-
-static struct acpi_option_info acpi_options[] =
-{
-	{"on", ACPI_ENABLED},
-	{"off", ACPI_DISABLED},
-	{"tables", ACPI_TABLES_ONLY},
-	{"chipset", ACPI_CHIPSET_ONLY},
-	{"no-errata", ACPI_IGNORE_ERRATA},
-	{"copy-tables", ACPI_COPY_TABLES},
-	{"trust-tables", ACPI_TRUST_TABLES},
-	{"no-sci", ACPI_SCI_DISABLED},
-	{"no-c2", ACPI_C2_DISABLED},
-	{"no-c3", ACPI_C3_DISABLED},
-	{"no-s1", ACPI_S1_DISABLED},
-	{"no-s5", ACPI_S5_DISABLED},
-	{NULL, 0},
-};
-
-static unsigned long acpi_opts = ACPI_ENABLED;
-
-struct acpi_errata_info
-{
-	const char *signature; // table signature (eg. "RSDT")
-	const char *oem;       // OEM name
-	const char *oem_table; // OEM table identifier (optional)
-	u32 oem_rev;           // OEM table revision (optional)
-	unsigned long options; // errata options
-};
-
-/*
- * We must identify systems that need ACPI_TRUST_TABLES solely from the
- * RSDP ("RSD PTR ").  All other options should be flagged from the
- * RSDT ("RSDT") which can be better identified.
- */
-struct acpi_errata_info acpi_errata[] =
-{
-	{"RSD PTR ", "AMI   ", NULL, 0, ACPI_TRUST_TABLES | ACPI_COPY_TABLES},
-	{NULL, NULL, 0, 0},
-};
-
-// bits 8-15 are SLP_TYPa, bits 0-7 are SLP_TYPb
-static unsigned long acpi_slp_typ[] = 
-{
-	ACPI_SLP_TYP_DISABLED, /* S0 */
-	ACPI_SLP_TYP_DISABLED, /* S1 */
-	ACPI_SLP_TYP_DISABLED, /* S2 */
-	ACPI_SLP_TYP_DISABLED, /* S3 */
-	ACPI_SLP_TYP_DISABLED, /* S4 */
-	ACPI_SLP_TYP_DISABLED  /* S5 */
-};
-
-struct acpi_table_info
-{
-	u32 expected_signature;
-	u32 expected_size;
-
-	struct acpi_table *table;
-	size_t size;
-	int mapped;
-};
-
-static struct acpi_table_info acpi_facp
-	= {ACPI_FACP_SIG, sizeof(struct acpi_facp), NULL, 0, 0};
-static struct acpi_table_info acpi_dsdt = {ACPI_DSDT_SIG, 0, NULL, 0, 0};
-static struct acpi_table_info acpi_facs
-	= {ACPI_FACS_SIG, sizeof(struct acpi_facs), NULL, 0, 0};
-static rwlock_t acpi_do_table_lock = RW_LOCK_UNLOCKED;
-
-static struct ctl_table acpi_table[] =
-{
-	{ACPI_FACP, "facp", &acpi_facp, 0, 0644, NULL, &acpi_do_table},
-
-	{ACPI_DSDT, "dsdt", &acpi_dsdt, 0, 0644, NULL, &acpi_do_table},
-	
-	{ACPI_FACS, "facs", &acpi_facs, 0, 0644, NULL, &acpi_do_table},
-
-	{ACPI_PM1_ENABLE, "pm1_enable",
-	 NULL, 0,
-	 0600, NULL, &acpi_do_event_reg},
-
-	{ACPI_GPE_ENABLE, "gpe_enable",
-	 NULL, 0,
-	 0600, NULL, &acpi_do_event_reg},
-
-	{ACPI_GPE_LEVEL, "gpe_level",
-	 NULL, 0,
-	 0600, NULL, &acpi_do_event_reg},
-
-	{ACPI_EVENT, "event", NULL, 0, 0400, NULL, &acpi_do_event},
-
-	{ACPI_P_BLK, "p_blk",
-	 &acpi_p_blk, sizeof(acpi_p_blk),
-	 0600, NULL, &acpi_do_ulong},
-
-	{ACPI_P_LVL2_LAT, "p_lvl2_lat",
-	 &acpi_p_lvl2_lat, sizeof(acpi_p_lvl2_lat),
-	 0644, NULL, &acpi_do_ulong},
-
-	{ACPI_P_LVL3_LAT, "p_lvl3_lat",
-	 &acpi_p_lvl3_lat, sizeof(acpi_p_lvl3_lat),
-	 0644, NULL, &acpi_do_ulong},
-
-	{ACPI_ENTER_LVL2_LAT, "enter_lvl2_lat",
-	 &acpi_enter_lvl2_lat, sizeof(acpi_enter_lvl2_lat),
-	 0644, NULL, &acpi_do_ulong},
-
-	{ACPI_ENTER_LVL3_LAT, "enter_lvl3_lat",
-	 &acpi_enter_lvl3_lat, sizeof(acpi_enter_lvl3_lat),
-	 0644, NULL, &acpi_do_ulong},
-
-	{ACPI_C1_TIME, "c1_time",
-	 Cx_stat+0, sizeof(struct Cx_stat_struct),
-	 0644, NULL, &acpi_do_stat},
-
-	{ACPI_C2_TIME, "c2_time",
-	 Cx_stat+1, sizeof(struct Cx_stat_struct),
-	 0644, NULL, &acpi_do_stat},
-
-	{ACPI_C3_TIME, "c3_time",
-	 Cx_stat+2, sizeof(struct Cx_stat_struct),
-	 0644, NULL, &acpi_do_stat},
-
-	{ACPI_S0_SLP_TYP, "s0_slp_typ",
-	 &acpi_slp_typ[ACPI_S0], sizeof(acpi_slp_typ[ACPI_S0]),
-	 0600, NULL, &acpi_do_ulong},
-
-	{ACPI_S1_SLP_TYP, "s1_slp_typ",
-	 &acpi_slp_typ[ACPI_S1], sizeof(acpi_slp_typ[ACPI_S1]),
-	 0600, NULL, &acpi_do_ulong},
-
-	{ACPI_S5_SLP_TYP, "s5_slp_typ",
-	 &acpi_slp_typ[ACPI_S5], sizeof(acpi_slp_typ[ACPI_S5]),
-	 0600, NULL, &acpi_do_ulong},
-
-	{ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &acpi_do_sleep},
-
-	{0}
-};
-
-static struct ctl_table acpi_dir_table[] =
-{
-	{CTL_ACPI, "acpi", NULL, 0, 0555, acpi_table},
-	{0}
-};
-
-static u32 FASTCALL(acpi_read_pm1_control(struct acpi_facp *));
-static u32 FASTCALL(acpi_read_pm1_status(struct acpi_facp *));
-static u32 FASTCALL(acpi_read_pm1_enable(struct acpi_facp *));
-static u32 FASTCALL(acpi_read_gpe_status(struct acpi_facp *));
-static u32 FASTCALL(acpi_read_gpe_enable(struct acpi_facp *));
-
-static void FASTCALL(acpi_write_pm1_control(struct acpi_facp *, u32));
-static void FASTCALL(acpi_write_pm1_status(struct acpi_facp *, u32));
-static void FASTCALL(acpi_write_pm1_enable(struct acpi_facp *, u32));
-static void FASTCALL(acpi_write_gpe_status(struct acpi_facp *, u32));
-static void FASTCALL(acpi_write_gpe_enable(struct acpi_facp *, u32));
-
-/*
- * Get the value of the PM1 control register (SCI_EN, ...)
- */
-static u32 acpi_read_pm1_control(struct acpi_facp *facp)
-{
-	u32 value = 0;
-	if (facp->pm1a_cnt)
-		value = inw(facp->pm1a_cnt);
-	if (facp->pm1b_cnt)
-		value |= inw(facp->pm1b_cnt);
-	return value;
-}
-
-/*
- * Set the value of the PM1 control register (BM_RLD, ...)
- */
-static void acpi_write_pm1_control(struct acpi_facp *facp, u32 value)
-{
-	if (facp->pm1a_cnt)
-		outw(value, facp->pm1a_cnt);
-	if (facp->pm1b_cnt)
-		outw(value, facp->pm1b_cnt);
-}
-
-/*
- * Get the value of the fixed event status register
- */
-static u32 acpi_read_pm1_status(struct acpi_facp *facp)
-{
-	u32 value = 0;
-	if (facp->pm1a_evt)
-		value = inw(facp->pm1a_evt);
-	if (facp->pm1b_evt)
-		value |= inw(facp->pm1b_evt);
-	return value;
-}
-
-/*
- * Set the value of the fixed event status register (clear events)
- */
-static void acpi_write_pm1_status(struct acpi_facp *facp, u32 value)
-{
-	if (facp->pm1a_evt)
-		outw(value, facp->pm1a_evt);
-	if (facp->pm1b_evt)
-		outw(value, facp->pm1b_evt);
-}
-
-/*
- * Get the value of the fixed event enable register
- */
-static u32 acpi_read_pm1_enable(struct acpi_facp *facp)
-{
-	int offset = facp->pm1_evt_len >> 1;
-	u32 value = 0;
-	if (facp->pm1a_evt)
-		value = inw(facp->pm1a_evt + offset);
-	if (facp->pm1b_evt)
-		value |= inw(facp->pm1b_evt + offset);
-	return value;
-}
-
-/*
- * Set the value of the fixed event enable register (enable events)
- */
-static void acpi_write_pm1_enable(struct acpi_facp *facp, u32 value)
-{
-	int offset = facp->pm1_evt_len >> 1;
-	if (facp->pm1a_evt)
-		outw(value, facp->pm1a_evt + offset);
-	if (facp->pm1b_evt)
-		outw(value, facp->pm1b_evt + offset);
-}
-
-/*
- * Get the value of the general-purpose event status register
- */
-static u32 acpi_read_gpe_status(struct acpi_facp *facp)
-{
-	u32 value = 0;
-	int i, size;
-
-	if (facp->gpe1) {
-		size = facp->gpe1_len >> 1;
-		for (i = size - 1; i >= 0; i--)
-			value = (value << 8) | inb(facp->gpe1 + i);
-	}
-	if (facp->gpe0) {
-		size = facp->gpe0_len >> 1;
-		for (i = size - 1; i >= 0; i--)
-			value = (value << 8) | inb(facp->gpe0 + i);
-	}
-	return value;
-}
-
-/*
- * Set the value of the general-purpose event status register (clear events)
- */
-static void acpi_write_gpe_status(struct acpi_facp *facp, u32 value)
-{
-	int i, size;
-
-	if (facp->gpe0) {
-		size = facp->gpe0_len >> 1;
-		for (i = 0; i < size; i++) {
-			outb(value & 0xff, facp->gpe0 + i);
-			value >>= 8;
-		}
-	}
-	if (facp->gpe1) {
-		size = facp->gpe1_len >> 1;
-		for (i = 0; i < size; i++) {
-			outb(value & 0xff, facp->gpe1 + i);
-			value >>= 8;
-		}
-	}
-}
-
-/*
- * Get the value of the general-purpose event enable register
- */
-static u32 acpi_read_gpe_enable(struct acpi_facp *facp)
-{
-	u32 value = 0;
-	int i, size, offset;
-	
-	offset = facp->gpe0_len >> 1;
-	if (facp->gpe1) {
-		size = facp->gpe1_len >> 1;
-		for (i = size - 1; i >= 0; i--) {
-			value = (value << 8) | inb(facp->gpe1 + offset + i);
-		}
-	}
-	if (facp->gpe0) {
-		size = facp->gpe0_len >> 1;
-		for (i = size - 1; i >= 0; i--)
-			value = (value << 8) | inb(facp->gpe0 + offset + i);
-	}
-	return value;
-}
-
-/*
- * Set the value of the general-purpose event enable register (enable events)
- */
-static void acpi_write_gpe_enable(struct acpi_facp *facp, u32 value)
-{
-	int i, offset;
-
-	offset = facp->gpe0_len >> 1;
-	if (facp->gpe0) {
-		for (i = 0; i < offset; i++) {
-			outb(value & 0xff, facp->gpe0 + offset + i);
-			value >>= 8;
-		}
-	}
-	if (facp->gpe1) {
-		offset = facp->gpe1_len >> 1;
-		for (i = 0; i < offset; i++) {
-			outb(value & 0xff, facp->gpe1 + offset + i);
-			value >>= 8;
-		}
-	}
-}
-
-/*
- * Map an ACPI table into virtual memory
- */
-static struct acpi_table *__init acpi_map_table(u32 addr)
-{
-	struct acpi_table *table = NULL;
-	if (addr) {
-		// map table header to determine size
-		table = (struct acpi_table *)
-			ioremap((unsigned long) addr,
-				sizeof(struct acpi_table));
-		if (table) {
-			unsigned long table_size = table->length;
-			iounmap(table);
-			// remap entire table
-			table = (struct acpi_table *)
-				ioremap((unsigned long) addr, table_size);
-		}
-
-		if (!table && addr < virt_to_phys(high_memory)) {
-			/* sometimes we see ACPI tables in low memory
-			 * and not reserved by the memory map (E820) code,
-			 * who is at fault for this?  BIOS?
-			 */
-			printk(KERN_ERR
-			       "ACPI: unreserved table memory @ 0x%p!\n",
-			       (void*) addr);
-
-			if (acpi_opts & ACPI_TRUST_TABLES) {
-				/* OK, trust that the table is there
-				 * if it isn't you'll get an OOPS here
-				 */
-				static u32 sig;
-				table = (struct acpi_table *)
-					phys_to_virt(addr);
-				sig = table->signature;
-			}
-		}
-	}
-	return table;
-}
-
-/*
- * Unmap an ACPI table from virtual memory
- */
-static void acpi_unmap_table(struct acpi_table *table)
-{
-	// iounmap ignores addresses within physical memory
-	if (table)
-		iounmap(table);
-}
-
-/*
- * Initialize an ACPI table
- */
-static int acpi_init_table(struct acpi_table_info *info,
-			   void *data,
-			   int mapped)
-{
-	struct acpi_table *table = (struct acpi_table*) data;
-
-	info->table = NULL;
-	info->size = 0;
-	info->mapped = 0;
-
-	if (!table || table->signature != info->expected_signature)
-		return -EINVAL;
-
-	if (mapped && (acpi_opts & ACPI_COPY_TABLES)) {
-		struct acpi_table *copy
-			= kmalloc(table->length, GFP_KERNEL);
-		if (!copy)
-			return -ENOMEM;
-		memcpy(copy, table, table->length);
-		table = copy;
-		mapped = 0;
-	}
-
-	info->table = table;
-	info->size = (size_t) table->length;
-	info->mapped = mapped;
-	return 0;
-}
-
-/*
- * Destroy an ACPI table
- */
-static void acpi_destroy_table(struct acpi_table_info *info)
-{
-	if (info->table) {
-		if (info->mapped)
-			acpi_unmap_table(info->table);
-		else
-			kfree(info->table);
-		info->table = NULL;
-	}
-}
-
-/*
- * Match ACPI table and set options based on platform errata, if any
- */
-static int __init acpi_find_errata(struct acpi_table *table)
-{
-	struct acpi_errata_info *info;
-	int size;
-
-	for (info = acpi_errata; info->signature && info->oem; info++) {
-		size = strlen(info->signature);
-		if (memcmp(&table->signature, info->signature, size))
-			continue;
-		if (strcmp(info->signature, "RSD PTR ")) {
-			// ordinary ACPI table
-			size = strlen(info->oem);
-			if (memcmp(table->oem, info->oem, size))
-				continue;
-			if (info->oem_table) {
-				size = strlen(info->oem_table);
-				if (memcmp(table->oem_table,
-					   info->oem_table,
-					   size))
-					continue;
-			}
-			if (info->oem_rev && table->oem_rev != info->oem_rev)
-				continue;
-		}
-		else {
-			// special handling for RSDP
-			size = strlen(info->oem);
-			if (memcmp(((struct acpi_rsdp*) table)->oem,
-				   info->oem,
-				   size))
-				continue;
-		}
-
-		printk(KERN_INFO
-		       "ACPI: found platform errata 0x%08lx\n",
-		       info->options);
-		acpi_opts |= info->options;
-		return 0;
-	}
-	return -1;
-}
-
-/*
- * Locate and map ACPI tables
- */
-static int __init acpi_find_tables(void)
-{
-	struct acpi_rsdp *rsdp;
-	struct acpi_table *rsdt;
-	u32 *rsdt_entry;
-	int rsdt_entry_count;
-	unsigned long i;
-
-	// search BIOS memory for RSDP
-	for (i = ACPI_BIOS_ROM_BASE; i < ACPI_BIOS_ROM_END; i += 16) {
-		rsdp = (struct acpi_rsdp *) phys_to_virt(i);
-		if (rsdp->signature[0] == ACPI_RSDP1_SIG
-		    && rsdp->signature[1] == ACPI_RSDP2_SIG) {
-			char oem[7];
-			int j;
-
-			// strip trailing space and print OEM identifier
-			memcpy(oem, rsdp->oem, 6);
-			oem[6] = '\0';
-			for (j = 5;
-			     j > 0 && (oem[j] == '\0' || oem[j] == ' ');
-			     j--) {
-				oem[j] = '\0';
-			}
-			printk(KERN_INFO "ACPI: \"%s\" found at 0x%p\n",
-			       oem, (void *) i);
-
-			break;
-		}
-	}
-	if (i >= ACPI_BIOS_ROM_END)
-		return -ENODEV;
-
-	// find any errata based on the RSDP
-	if (!acpi_find_errata((struct acpi_table*) rsdp)) {
-		if (acpi_opts & ACPI_DISABLED)
-			return -EINVAL;
-		else if (acpi_opts & ACPI_CHIPSET_ONLY)
-			return -ENODEV;
-	}
-
-	// fetch RSDT from RSDP
-	rsdt = acpi_map_table(rsdp->rsdt);
-	if (!rsdt) {
-		printk(KERN_ERR "ACPI: missing RSDT at 0x%p\n",
-		       (void*) rsdp->rsdt);
-		return -EINVAL;
-	}
-	else if (rsdt->signature != ACPI_RSDT_SIG) {
-		printk(KERN_ERR "ACPI: bad RSDT at 0x%p (%08x)\n",
-		       (void*) rsdp->rsdt, (unsigned) rsdt->signature);
-		acpi_unmap_table(rsdt);
-		return -EINVAL;
-	}
-
-	// find any errata based on the RSDT
-	if (!acpi_find_errata(rsdt)) {
-		if (acpi_opts & ACPI_DISABLED)
-			return -EINVAL;
-		else if (acpi_opts & ACPI_CHIPSET_ONLY)
-			return -ENODEV;
-	}
-
-	// search RSDT for FACP
-	acpi_facp.table = NULL;
-	rsdt_entry = (u32 *) (rsdt + 1);
-	rsdt_entry_count = (int) ((rsdt->length - sizeof(*rsdt)) >> 2);
-	while (rsdt_entry_count) {
-		struct acpi_table *dt = acpi_map_table(*rsdt_entry);
-		if (!acpi_init_table(&acpi_facp, dt, 1)) {
-			struct acpi_facp *facp
-				= (struct acpi_facp*) acpi_facp.table;
-			struct acpi_table *facs;
-
-			// map DSDT if it exists
-			if ((dt = acpi_map_table(facp->dsdt))) {
-				if (acpi_init_table(&acpi_dsdt, dt, 1))
-					acpi_unmap_table(dt);
-			}
-			
-			/*
-			 * map FACS if it exists
-			 */
-			if ((facs = acpi_map_table(facp->facs))) {
-				if (acpi_init_table(&acpi_facs,facs,1))
-					acpi_unmap_table(facs);
-			}
-			break;
-		}
-		else {
-			acpi_unmap_table(dt);
-		}
-
-		rsdt_entry++;
-		rsdt_entry_count--;
-	}
-
-	acpi_unmap_table(rsdt);
-
-	if (!acpi_facp.table) {
-		printk(KERN_ERR "ACPI: missing FACP\n");
-		return -EINVAL;
-	}
-	return 0;
-}
-
-/*
- * Unmap or destroy ACPI tables
- */
-static void acpi_destroy_tables(void)
-{
-	acpi_destroy_table(&acpi_facs);
-	acpi_destroy_table(&acpi_dsdt);
-	acpi_destroy_table(&acpi_facp);
-}
-
-/*
- * Init PIIX4 device, create a fake FACP
- */
-static int __init acpi_init_piix4(struct pci_dev *dev)
-{
-	struct acpi_facp *facp;
-	u32 base;
-	u16 cmd;
-	u8 pmregmisc;
-
-	pci_read_config_word(dev, PCI_COMMAND, &cmd);
-	if (!(cmd & PCI_COMMAND_IO))
-		return -ENODEV;
-	
-	pci_read_config_byte(dev, ACPI_PIIX4_PMREGMISC, &pmregmisc);
-	if (!(pmregmisc & ACPI_PIIX4_PMIOSE))
-		return -ENODEV;
-	
-	base = pci_resource_start (dev, PCI_BRIDGE_RESOURCES);
-	if (!base)
-		return -ENODEV;
-
-	printk(KERN_INFO "ACPI: found PIIX4 at 0x%04x\n", base);
-
-	facp = kmalloc(sizeof(struct acpi_facp), GFP_KERNEL);
-	if (!facp)
-		return -ENOMEM;
-
-	memset(facp, 0, sizeof(struct acpi_facp));
-	facp->hdr.signature = ACPI_FACP_SIG;
-	facp->hdr.length = sizeof(struct acpi_facp);
-	facp->int_model = ACPI_PIIX4_INT_MODEL;
-	facp->sci_int = ACPI_PIIX4_SCI_INT;
-	facp->smi_cmd = ACPI_PIIX4_SMI_CMD;
-	facp->acpi_enable = ACPI_PIIX4_ACPI_ENABLE;
-	facp->acpi_disable = ACPI_PIIX4_ACPI_DISABLE;
-	facp->s4bios_req = ACPI_PIIX4_S4BIOS_REQ;
-	facp->pm1a_evt = base + ACPI_PIIX4_PM1_EVT;
-	facp->pm1a_cnt = base + ACPI_PIIX4_PM1_CNT;
-	facp->pm2_cnt = ACPI_PIIX4_PM2_CNT;
-	facp->pm_tmr = base + ACPI_PIIX4_PM_TMR;
-	facp->gpe0 = base + ACPI_PIIX4_GPE0;
-	facp->pm1_evt_len = ACPI_PIIX4_PM1_EVT_LEN;
-	facp->pm1_cnt_len = ACPI_PIIX4_PM1_CNT_LEN;
-	facp->pm2_cnt_len = ACPI_PIIX4_PM2_CNT_LEN;
-	facp->pm_tm_len = ACPI_PIIX4_PM_TM_LEN;
-	facp->gpe0_len = ACPI_PIIX4_GPE0_LEN;
-	facp->p_lvl2_lat = (__u16) ACPI_INFINITE_LAT;
-	facp->p_lvl3_lat = (__u16) ACPI_INFINITE_LAT;
-
-	acpi_init_table(&acpi_facp, facp, 0);
-	acpi_init_table(&acpi_dsdt, NULL, 0);
-
-	acpi_p_blk = base + ACPI_PIIX4_P_BLK;
-
-	return 0;
-}
-
-/*
- * Init VIA ACPI device and create a fake FACP
- */
-static int __init acpi_init_via(struct pci_dev *dev)
-{
-	struct acpi_facp *facp;
-	u32 base;
-	u8 tmp, irq;
-
-	pci_read_config_byte(dev, 0x41, &tmp);
-	if (!(tmp & 0x80))
-		return -ENODEV;
-
-	base = pci_resource_start(dev, PCI_BRIDGE_RESOURCES);
-	if (!base) {
-		base = pci_resource_start(dev, PCI_BASE_ADDRESS_4);
-		if (!base)
-			return -ENODEV;
-	}
-
-	pci_read_config_byte(dev, 0x42, &irq);
-
-	printk(KERN_INFO "ACPI: found %s at 0x%04x\n", dev->name, base);
-
-	facp = kmalloc(sizeof(struct acpi_facp), GFP_KERNEL);
-	if (!facp)
-		return -ENOMEM;
-
-	memset(facp, 0, sizeof(struct acpi_facp));
-	facp->hdr.signature = ACPI_FACP_SIG;
-	facp->hdr.length = sizeof(struct acpi_facp);
-	facp->int_model = ACPI_VIA_INT_MODEL;
-	facp->sci_int = irq;
-	facp->smi_cmd = base + ACPI_VIA_SMI_CMD;
-	facp->acpi_enable = ACPI_VIA_ACPI_ENABLE;
-	facp->acpi_disable = ACPI_VIA_ACPI_DISABLE;
-	facp->pm1a_evt = base + ACPI_VIA_PM1_EVT;
-	facp->pm1a_cnt = base + ACPI_VIA_PM1_CNT;
-	facp->pm_tmr = base + ACPI_VIA_PM_TMR;
-	facp->gpe0 = base + ACPI_VIA_GPE0;
-
-	facp->pm1_evt_len = ACPI_VIA_PM1_EVT_LEN;
-	facp->pm1_cnt_len = ACPI_VIA_PM1_CNT_LEN;
-	facp->pm_tm_len = ACPI_VIA_PM_TM_LEN;
-	facp->gpe0_len = ACPI_VIA_GPE0_LEN;
-	facp->p_lvl2_lat = (__u16) ACPI_INFINITE_LAT;
-	facp->p_lvl3_lat = (__u16) ACPI_INFINITE_LAT;
-
-	facp->duty_offset = ACPI_VIA_DUTY_OFFSET;
-	facp->duty_width = ACPI_VIA_DUTY_WIDTH;
-
-	facp->day_alarm = ACPI_VIA_DAY_ALARM;
-	facp->mon_alarm = ACPI_VIA_MON_ALARM;
-	facp->century = ACPI_VIA_CENTURY;
-
-	acpi_init_table(&acpi_facp, facp, 0);
-	acpi_init_table(&acpi_dsdt, NULL, 0);
-
-	acpi_p_blk = base + ACPI_VIA_P_BLK;
-
-	return 0;
-}
-
-typedef enum
-{
-	CH_UNKNOWN = 0,
-	CH_INTEL_PIIX4,
-	CH_VIA_586,
-	CH_VIA_686A,
-} acpi_chip_t;
-
-/* indexed by value of each enum in acpi_chip_t */
-const static struct
-{
-	int (*chip_init)(struct pci_dev *dev);
-} acpi_chip_info[] =
-{
-	{NULL,},
-	{acpi_init_piix4},
-	{acpi_init_via},
-	{acpi_init_via},
-};
-	
-static struct pci_device_id acpi_pci_tbl[] __initdata =
-{
-	{0x8086, 0x7113, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_INTEL_PIIX4},
-	{0x1106, 0x3040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_VIA_586},
-	{0x1106, 0x3057, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_VIA_686A},
-	{0,} /* terminate list */
-};
-
-static int __init acpi_probe(struct pci_dev *dev,
-			     const struct pci_device_id *id)
-{
-	return acpi_chip_info[id->driver_data].chip_init(dev);
-}
-
-static struct pci_driver acpi_driver =
-{
-	name:		"acpi",
-	id_table:	acpi_pci_tbl,
-	probe:		acpi_probe,
-};
-static int pci_driver_registered = 0;
-
-/*
- * Locate a known ACPI chipset
- */
-static int __init acpi_find_chipset(void)
-{
-	if (pci_register_driver(&acpi_driver) < 1)
-		return -ENODEV;
-
-	pci_driver_registered = 1;
-
-	return 0;
-}
-
-/*
- * Handle an ACPI SCI (fixed or general purpose event)
- */
-static void acpi_irq(int irq, void *dev_id, struct pt_regs *regs)
-{
-	struct acpi_facp *facp = (struct acpi_facp*) acpi_facp.table;
-	u32 pm1_status, gpe_status, gpe_level, gpe_edge;
-	unsigned long flags;
-
-	// detect and clear fixed events
-	pm1_status = (acpi_read_pm1_status(facp) & acpi_read_pm1_enable(facp));
-	acpi_write_pm1_status(facp, pm1_status);
-	
-	// detect and handle general-purpose events
-	gpe_status = (acpi_read_gpe_status(facp) & acpi_read_gpe_enable(facp));
-	gpe_level = gpe_status & acpi_gpe_level;
-	if (gpe_level) {
-		// disable level-triggered events (re-enabled after handling)
-		acpi_write_gpe_enable(facp,
-				      acpi_read_gpe_enable(facp) & ~gpe_level);
-	}
-	gpe_edge = gpe_status & ~gpe_level;
-	if (gpe_edge) {
-		// clear edge-triggered events
-		while (acpi_read_gpe_status(facp) & gpe_edge)
-			acpi_write_gpe_status(facp, gpe_edge);
-	}
-
-	// notify process waiting on /dev/acpi
-	spin_lock_irqsave(&acpi_event_lock, flags);
-	acpi_pm1_status |= pm1_status;
-	acpi_gpe_status |= gpe_status;
-	spin_unlock_irqrestore(&acpi_event_lock, flags);
-	acpi_event_state = acpi_sleep_state;
-	wake_up_interruptible(&acpi_event_wait);
-}
-
-/*
- * Is SCI to be enabled?
- */
-static inline int
-acpi_sci_enabled(void)
-{
-	return !(acpi_opts & ACPI_SCI_DISABLED);
-}
-
-/*
- * Is ACPI enabled or not?
- */
-static inline int acpi_is_enabled(struct acpi_facp *facp)
-{
-	return ((acpi_read_pm1_control(facp) & ACPI_SCI_EN) ? 1:0);
-}
-
-/*
- * Enable SCI
- */
-static int acpi_enable(struct acpi_facp *facp)
-{
-	if (facp->smi_cmd && acpi_sci_enabled())
-		outb(facp->acpi_enable, facp->smi_cmd);
-	return (acpi_is_enabled(facp) ? 0:-1);
-}
-
-/*
- * Disable SCI
- */
-static int acpi_disable(struct acpi_facp *facp)
-{
-	if (facp->smi_cmd && acpi_sci_enabled()) {
-		// disable and clear any pending events
-		acpi_write_gpe_enable(facp, 0);
-		while (acpi_read_gpe_status(facp)) {
-			acpi_write_gpe_status(facp,
-					      acpi_read_gpe_status(facp));
-		}
-		acpi_write_pm1_enable(facp, 0);
-		acpi_write_pm1_status(facp, acpi_read_pm1_status(facp));
-
-		/* writing acpi_disable to smi_cmd would be appropriate
-		 * here but this causes a nasty crash on many systems
-		 */
-	}
-
-	return 0;
-}
-
-static inline int bm_activity(struct acpi_facp *facp)
-{
-	return acpi_read_pm1_status(facp) & ACPI_BM;
-}
-
-static inline void clear_bm_activity(struct acpi_facp *facp)
-{
-	acpi_write_pm1_status(facp, ACPI_BM);
-}
-
-static void sleep_on_busmaster(struct acpi_facp *facp)
-{
-	u32 pm1_cntr = acpi_read_pm1_control(facp);
-	if (pm1_cntr & ACPI_BM_RLD) {
-		pm1_cntr &= ~ACPI_BM_RLD;
-		acpi_write_pm1_control(facp, pm1_cntr);
-	}
-}
-
-static void wake_on_busmaster(struct acpi_facp *facp)
-{
-	u32 pm1_cntr = acpi_read_pm1_control(facp);
-	if (!(pm1_cntr & ACPI_BM_RLD)) {
-		pm1_cntr |= ACPI_BM_RLD;
-		acpi_write_pm1_control(facp, pm1_cntr);
-	}
-	clear_bm_activity(facp);
-}
-
-/* The ACPI timer is just the low 24 bits */
-#define TIME_BEGIN(tmr)			inl(tmr)
-#define TIME_END(tmr, begin)		((inl(tmr) - (begin)) & 0x00ffffff)
-
-
-/*
- * Idle loop (uniprocessor only)
- */
-static void acpi_idle(void)
-{
-	static int sleep_level = 1;
-	struct acpi_facp *facp = (struct acpi_facp*) acpi_facp.table;
-
-	if (!facp || !facp->pm_tmr || !acpi_p_blk)
-		goto not_initialized;
-
-	/*
-	 * start from the previous sleep level..
-	 */
-	if (sleep_level == 1)
-		goto sleep1;
-	if (sleep_level == 2)
-		goto sleep2;
-sleep3:
-	sleep_level = 3;
-	if (!acpi_p_lvl3_tested) {
-		printk(KERN_INFO "ACPI C3 works\n");
-		acpi_p_lvl3_tested = 1;
-	}
-	wake_on_busmaster(facp);
-	if (facp->pm2_cnt)
-		goto sleep3_with_arbiter;
-
-	for (;;) {
-		unsigned long time;
-		unsigned int pm_tmr = facp->pm_tmr;
-
-		__cli();
-		if (current->need_resched)
-			goto out;
-		if (bm_activity(facp))
-			goto sleep2;
-
-		time = TIME_BEGIN(pm_tmr);
-		inb(acpi_p_blk + ACPI_P_LVL3);
-		inl(pm_tmr);					/* Dummy read, force synchronization with the PMU */
-		time = TIME_END(pm_tmr, time);
-
-		__sti();
-		cx_statistics(3, time);
-		if (time < acpi_p_lvl3_lat)
-			goto sleep2;
-	}
-
-sleep3_with_arbiter:
-	for (;;) {
-		unsigned long time;
-		u8 arbiter;
-		unsigned int pm2_cntr = facp->pm2_cnt;
-		unsigned int pm_tmr = facp->pm_tmr;
-
-		__cli();
-		if (current->need_resched)
-			goto out;
-		if (bm_activity(facp))
-			goto sleep2;
-
-		time = TIME_BEGIN(pm_tmr);
-		arbiter = inb(pm2_cntr) & ~ACPI_ARB_DIS;
-		outb(arbiter | ACPI_ARB_DIS, pm2_cntr);		/* Disable arbiter, park on CPU */
-		inb(acpi_p_blk + ACPI_P_LVL3);
-		inl(pm_tmr);					/* Dummy read, force synchronization with the PMU */
-		time = TIME_END(pm_tmr, time);
-		outb(arbiter, pm2_cntr);			/* Enable arbiter again.. */
-
-		__sti();
-		cx_statistics(3, time);
-		if (time < acpi_p_lvl3_lat)
-			goto sleep2;
-	}
-
-sleep2:
-	sleep_level = 2;
-	if (!acpi_p_lvl2_tested) {
-		printk(KERN_INFO "ACPI C2 works\n");
-		acpi_p_lvl2_tested = 1;
-	}
-	wake_on_busmaster(facp);	/* Required to track BM activity.. */
-	for (;;) {
-		unsigned long time;
-		unsigned int pm_tmr = facp->pm_tmr;
-
-		__cli();
-		if (current->need_resched)
-			goto out;
-
-		time = TIME_BEGIN(pm_tmr);
-		inb(acpi_p_blk + ACPI_P_LVL2);
-		inl(pm_tmr);					/* Dummy read, force synchronization with the PMU */
-		time = TIME_END(pm_tmr, time);
-
-		__sti();
-		cx_statistics(2, time);
-		if (time < acpi_p_lvl2_lat)
-			goto sleep1;
-		if (bm_activity(facp)) {
-			clear_bm_activity(facp);
-			continue;
-		}
-		if (time > acpi_enter_lvl3_lat)
-			goto sleep3;
-	}
-
-sleep1:
-	sleep_level = 1;
-	sleep_on_busmaster(facp);
-	for (;;) {
-		unsigned long time;
-		unsigned int pm_tmr = facp->pm_tmr;
-
-		__cli();
-		if (current->need_resched)
-			goto out;
-		time = TIME_BEGIN(pm_tmr);
-		__asm__ __volatile__("sti ; hlt": : :"memory");
-		time = TIME_END(pm_tmr, time);
-		cx_statistics(1, time);
-		if (time > acpi_enter_lvl2_lat)
-			goto sleep2;
-	}
-
-not_initialized:
-	for (;;) {
-		__cli();
-		if (current->need_resched)
-			goto out;
-		__asm__ __volatile__("sti ; hlt": : :"memory");
-	}
-
-out:
-	__sti();
-}
-
-/*
- * Put all devices into specified D-state
- */
-static int acpi_enter_dx(acpi_dstate_t state)
-{
-	int status = 0;
-	
-	if (state == ACPI_D0)
-		status = pm_send_all(PM_RESUME, (void*) state);
-	else
-		status = pm_send_all(PM_SUSPEND, (void*) state);
-
-	return status;
-}
-
-/*
- * Update system time from real-time clock
- */
-static void acpi_update_clock(void)
-{
-	if (acpi_sleep_start) {
-		unsigned long delta;
-		struct timeval tv;
-		
-		delta = get_cmos_time() - acpi_sleep_start;
-		do_gettimeofday(&tv);
-		tv.tv_sec += delta;
-		do_settimeofday(&tv);
-		
-		acpi_sleep_start = 0;
-	}
-}
-
-/*
- * Enter system sleep state
- */
-static int acpi_enter_sx(acpi_sstate_t state)
-{
-	unsigned long slp_typ;
-	u16 typa, typb, value;
-	struct acpi_facp *facp;
-
-	slp_typ = acpi_slp_typ[(int) state];
-	if (slp_typ == ACPI_SLP_TYP_DISABLED)
-		return -EPERM;
-
-	// bits 8-15 are SLP_TYPa, bits 0-7 are SLP_TYPb
-	typa = (slp_typ >> 8) & 0xff;
-	typb = slp_typ & 0xff;
-	
-	typa = ((typa << ACPI_SLP_TYP_SHIFT) & ACPI_SLP_TYP_MASK);
-	typb = ((typb << ACPI_SLP_TYP_SHIFT) & ACPI_SLP_TYP_MASK);
-
-	acpi_sleep_start = get_cmos_time();
-	acpi_enter_dx(ACPI_D3);
-	// disable interrupts globally while suspended
-	cli();
-	acpi_sleep_state = state;
-
-	facp = (struct acpi_facp*) acpi_facp.table;
-	
-	// clear wake status
-	acpi_write_pm1_status(facp, ACPI_WAK);
-	
-	// set SLP_TYPa/b and SLP_EN
-	if (facp->pm1a_cnt) {
-		value = inw(facp->pm1a_cnt) & ~ACPI_SLP_TYP_MASK;
-		outw(value | typa | ACPI_SLP_EN, facp->pm1a_cnt);
-	}
-	if (facp->pm1b_cnt) {
-		value = inw(facp->pm1b_cnt) & ~ACPI_SLP_TYP_MASK;
-		outw(value | typb | ACPI_SLP_EN, facp->pm1b_cnt);
-	}
-	
-	// wait until S1 is entered
-	while (!(acpi_read_pm1_status(facp) & ACPI_WAK)) ;
-	// finished sleeping, update system time
-	acpi_update_clock();
-	acpi_enter_dx(ACPI_D0);
-	// reenable interrupts globally after resume
-	sti();
-	acpi_sleep_state = ACPI_S0;
-	
-	return 0;
-}
-
-/*
- * Enter soft-off (S5)
- */
-static void acpi_power_off(void)
-{
-	acpi_enter_sx(ACPI_S5);
-}
-
-/*
- * Claim I/O port if available
- */
-static int acpi_claim(unsigned long start, unsigned long size)
-{
-	if (start && size)
-		if (!request_region(start, size, "acpi"))
-			return -EBUSY;
-	return 0;
-}
-
-/*
- * Claim ACPI I/O ports
- */
-static int acpi_claim_ioports(struct acpi_facp *facp)
-{
-	// we don't get a guarantee of contiguity for any of the ACPI registers
-	if (acpi_claim(facp->pm1a_evt, facp->pm1_evt_len))
-		goto return_ebusy;
-	if (acpi_claim(facp->pm1b_evt, facp->pm1_evt_len))
-		goto release_pm1a_evt;
-	if (acpi_claim(facp->pm1a_cnt, facp->pm1_cnt_len))
-		goto release_pm1b_evt;
-	if (acpi_claim(facp->pm1b_cnt, facp->pm1_cnt_len))
-		goto release_pm1a_cnt;
-	if (acpi_claim(facp->pm_tmr, facp->pm_tm_len))
-		goto release_pm1b_cnt;
-	if (acpi_claim(facp->gpe0, facp->gpe0_len))
-		goto release_pm_tmr;
-	if (acpi_claim(facp->gpe1, facp->gpe1_len))
-		goto release_gpe0;
-	return 0;
-release_gpe0:		acpi_release(facp->gpe0, facp->gpe0_len);
-release_pm_tmr:		acpi_release(facp->pm_tmr, facp->pm_tm_len);
-release_pm1b_cnt:	acpi_release(facp->pm1b_cnt, facp->pm1_cnt_len);
-release_pm1a_cnt:	acpi_release(facp->pm1a_cnt, facp->pm1_cnt_len);
-release_pm1b_evt:	acpi_release(facp->pm1b_evt, facp->pm1_evt_len);
-release_pm1a_evt:	acpi_release(facp->pm1a_evt, facp->pm1_evt_len);
-return_ebusy:		return -EBUSY;
-}
-
-/*
- * Release I/O port if claimed
- */
-static void acpi_release(unsigned long start, unsigned long size)
-{
-	if (start && size)
-		release_region(start, size);
-}
-
-/*
- * Free ACPI I/O ports
- */
-static int acpi_release_ioports(struct acpi_facp *facp)
-{
-	// we don't get a guarantee of contiguity for any of the ACPI registers
-	acpi_release(facp->gpe1, facp->gpe1_len);
-	acpi_release(facp->gpe0, facp->gpe0_len);
-	acpi_release(facp->pm_tmr, facp->pm_tm_len);
-	acpi_release(facp->pm1b_cnt, facp->pm1_cnt_len);
-	acpi_release(facp->pm1a_cnt, facp->pm1_cnt_len);
-	acpi_release(facp->pm1b_evt, facp->pm1_evt_len);
-	acpi_release(facp->pm1a_evt, facp->pm1_evt_len);
-	return 0;
-}
-
-/*
- * Determine if modification of value is permitted
- */
-static int
-acpi_verify_mod(int ctl_name)
-{
-	switch (ctl_name) {
-	case ACPI_PM1_ENABLE:
-	case ACPI_GPE_ENABLE:
-	case ACPI_GPE_LEVEL:
-		if (!acpi_sci_enabled())
-			return -EPERM;
-		break;
-	case ACPI_P_LVL2_LAT:
-	case ACPI_ENTER_LVL2_LAT:
-		if (acpi_opts & ACPI_C2_DISABLED)
-			return -EPERM;
-		break;
-	case ACPI_P_LVL3_LAT:
-	case ACPI_ENTER_LVL3_LAT:
-		if (acpi_opts & ACPI_C3_DISABLED)
-			return -EPERM;
-		break;
-	case ACPI_S1_SLP_TYP:
-	case ACPI_SLEEP:
-		if (acpi_opts & ACPI_S1_DISABLED)
-			return -EPERM;
-		break;
-	case ACPI_S5_SLP_TYP:
-		if (acpi_opts & ACPI_S5_DISABLED)
-			return -EPERM;
-		break;
-	}
-	return 0;
-}
-
-/*
- * Examine/modify value
- */
-static int acpi_do_ulong(ctl_table *ctl,
-			 int write,
-			 struct file *file,
-			 void *buffer,
-			 size_t *len)
-{
-	char str[2 * sizeof(unsigned long) + 4], *strend;
-	unsigned long val;
-	int size;
-
-	if (!write) {
-		if (file->f_pos) {
-			*len = 0;
-			return 0;
-		}
-
-		val = *(unsigned long*) ctl->data;
-		size = sprintf(str, "0x%08lx\n", val);
-		if (*len >= size) {
-			if (copy_to_user(buffer, str, size))
-				return -EFAULT;
-			*len = size;
-		}
-		else
-			*len = 0;
-	}
-	else {
-		if (acpi_verify_mod(ctl->ctl_name))
-			return -EPERM;
-
-		size = sizeof(str) - 1;
-		if (size > *len)
-			size = *len;
-		if (copy_from_user(str, buffer, size))
-			return -EFAULT;
-		str[size] = '\0';
-		val = simple_strtoul(str, &strend, 0);
-		if (strend == str)
-			return -EINVAL;
-		*(unsigned long*) ctl->data = val;
-	}
-
-	file->f_pos += *len;
-	return 0;
-}
-
-/*
- * Determine if user buffer contains a valid table
- */
-static int acpi_verify_table(void *buffer,
-			     size_t size,
-			     struct acpi_table_info *info)
-{
-	struct acpi_table hdr;
-	size_t table_size;
-
-	if (size < sizeof(struct acpi_table))
-		return -EINVAL;
-
-	if (copy_from_user(&hdr, buffer, sizeof(hdr)))
-		return -EFAULT;
-
-	table_size = (size_t) hdr.length;
-	if (hdr.signature != info->expected_signature
-	    || table_size < size
-	    || (info->expected_size
-		&& table_size != info->expected_size))
-		return -EINVAL;
-
-	return 0;
-}
-
-/*
- * Examine/replace an ACPI table
- */
-static int acpi_do_table(ctl_table *ctl,
-			 int write,
-			 struct file *file,
-			 void *buffer,
-			 size_t *len)
-{
-	struct acpi_table_info *info = (struct acpi_table_info *) ctl->data;
-	u8 *data = NULL;
-	size_t size = 0;
-	int error = 0;
-
-	if (!info) {
-		*len = 0;
-		return 0;
-	}
-
-	if (!write) {
-		// table read
-		read_lock(&acpi_do_table_lock);
-		if (info->table && file->f_pos < info->size) {
-			data = (u8*) info->table + file->f_pos;
-			size = info->size - file->f_pos;
-			if (size > *len)
-				size = *len;
-			if (copy_to_user(buffer, data, size))
-				error = -EFAULT;
-		}
-		read_unlock(&acpi_do_table_lock);
-	}
-	else if (file->f_pos) {
-		// table body replacement
-		write_lock(&acpi_do_table_lock);
-		if (info->table && file->f_pos < info->size) {
-			data = (u8*) info->table + file->f_pos;
-			size = info->size - file->f_pos;
-			if (size > *len)
-				size = *len;
-			if (copy_from_user(data, buffer, size))
-				error = -EFAULT;
-		}
-		write_unlock(&acpi_do_table_lock);
-	}
-	else {
-		// table header/body replacement
-		struct acpi_table hdr;
-		size_t table_size;
-
-		// make sure we are being given a valid table
-		error = acpi_verify_table(buffer, *len, info);
-		if (error)
-			return error;
-		if (copy_from_user(&hdr, buffer, sizeof(hdr)))
-			return -EFAULT;
-		table_size = (size_t) hdr.length;
-		
-		write_lock(&acpi_do_table_lock);
-		
-		data = (u8*) info->table;
-		size = *len;
-		
-		if (!data || info->mapped || table_size != info->size) {
-			// allocate a (different sized) table
-			data = kmalloc(table_size, GFP_KERNEL);
-			if (data) {
-				memset(data, 0, table_size);
-				memcpy(data, &hdr, sizeof(hdr));
-				acpi_destroy_table(info);
-				acpi_init_table(info, data, 0);
-			}
-			else
-				error = -ENOMEM;
-		}
-		if (data)
-			if (copy_from_user(data, buffer, size)) {
-				acpi_destroy_table(info);
-				error = -EFAULT;
-			}
-		
-		write_unlock(&acpi_do_table_lock);
-	}
-
-	if (error)
-		return error;
-
-	*len = size;
-	file->f_pos += size;
-	return 0;
-}
-
-/*
- * Examine/modify event register
- */
-static int acpi_do_event_reg(ctl_table *ctl,
-			     int write,
-			     struct file *file,
-			     void *buffer,
-			     size_t *len)
-{
-	struct acpi_facp *facp = (struct acpi_facp*) acpi_facp.table;
-	char str[2 * sizeof(u32) + 4], *strend;
-	u32 val, enabling;
-	int size;
-
-	if (!write) {
-		if (file->f_pos) {
-			*len = 0;
-			return 0;
-		}
-
-		val = 0;
-		switch (ctl->ctl_name) {
-		case ACPI_PM1_ENABLE:
-			val = acpi_read_pm1_enable(facp);
-			break;
-		case ACPI_GPE_ENABLE:
-			val = acpi_read_gpe_enable(facp);
-			break;
-		case ACPI_GPE_LEVEL:
-			val = acpi_gpe_level;
-			break;
-		}
-		
-		size = sprintf(str, "0x%08x\n", val);
-		if (*len >= size) {
-			if (copy_to_user(buffer, str, size))
-				return -EFAULT;
-			*len = size;
-		}
-		else
-			*len = 0;
-	}
-	else
-	{
-		if (acpi_verify_mod(ctl->ctl_name))
-			return -EPERM;
-
-		// fetch user value
-		size = sizeof(str) - 1;
-		if (size > *len)
-			size = *len;
-		if (copy_from_user(str, buffer, size))
-			return -EFAULT;
-		str[size] = '\0';
-		val = (u32) simple_strtoul(str, &strend, 0);
-		if (strend == str)
-			return -EINVAL;
-
-		// store value in register
-		switch (ctl->ctl_name) {
-		case ACPI_PM1_ENABLE:
-			// clear previously disabled events
-			enabling = (val & ~acpi_read_pm1_enable(facp));
-			acpi_write_pm1_status(facp, enabling);
-			
-			if (val) {
-				// enable ACPI unless it is already
-				if (!acpi_is_enabled(facp))
-					acpi_enable(facp);
-			}
-			else if (!acpi_read_gpe_enable(facp)) {
-				// disable ACPI unless it is already
-				if (acpi_is_enabled(facp))
-					acpi_disable(facp);
-			}
-			
-			acpi_write_pm1_enable(facp, val);
-			break;
-		case ACPI_GPE_ENABLE:
-			// clear previously disabled events
-			enabling = (val
-				    & ~acpi_read_gpe_enable(facp));
-			while (acpi_read_gpe_status(facp) & enabling)
-				acpi_write_gpe_status(facp, enabling);
-			
-			if (val) {
-				// enable ACPI unless it is already
-				if (!acpi_is_enabled(facp))
-					acpi_enable(facp);
-			}
-			else if (!acpi_read_pm1_enable(facp)) {
-				// disable ACPI unless it is already
-				if (acpi_is_enabled(facp))
-					acpi_disable(facp);
-			}
-			
-			acpi_write_gpe_enable(facp, val);
-			break;
-		case ACPI_GPE_LEVEL:
-			acpi_gpe_level = val;
-			break;
-		}
-	}
-
-	file->f_pos += *len;
-	return 0;
-}
-
-/*
- * Wait for next event
- */
-static int acpi_do_event(ctl_table *ctl,
-			 int write,
-			 struct file *file,
-			 void *buffer,
-			 size_t *len)
-{
-	u32 pm1_status = 0, gpe_status = 0;
-	acpi_sstate_t event_state = 0;
-	char str[27];
-	int size;
-
-	if (write)
-		return -EPERM;
-	if (*len < sizeof(str)) {
-		*len = 0;
-		return 0;
-	}
-
-	for (;;) {
-		unsigned long flags;
-		
-		// we need an atomic exchange here
-		spin_lock_irqsave(&acpi_event_lock, flags);
-		pm1_status = acpi_pm1_status;
-		acpi_pm1_status = 0;
-		gpe_status = acpi_gpe_status;
-		acpi_gpe_status = 0;
-		spin_unlock_irqrestore(&acpi_event_lock, flags);
-		event_state = acpi_event_state;
-		
-		if (pm1_status || gpe_status)
-			break;
-		
-		// wait for an event to arrive
-		interruptible_sleep_on(&acpi_event_wait);
-		if (signal_pending(current))
-			return -ERESTARTSYS;
-	}
-
-	size = sprintf(str, "0x%08x 0x%08x 0x%01x\n",
-		       pm1_status,
-		       gpe_status,
-		       event_state);
-	if (copy_to_user(buffer, str, size))
-		return -EFAULT;
-	*len = size;
-	file->f_pos += size;
-
-	return 0;
-}
-
-/*
- * Enter system sleep state
- */
-static int acpi_do_sleep(ctl_table *ctl,
-			 int write,
-			 struct file *file,
-			 void *buffer,
-			 size_t *len)
-{
-	if (!write) {
-		if (file->f_pos) {
-			*len = 0;
-			return 0;
-		}
-	}
-	else
-	{
-		if (acpi_verify_mod(ctl->ctl_name) || acpi_enter_sx(ACPI_S1))
-			return -EPERM;
-	}
-	file->f_pos += *len;
-	return 0;
-}
-
-/*
- * Parse command line options
- */
-static int __init acpi_setup(char *str)
-{
-	while (str && *str) {
-		struct acpi_option_info *opt = acpi_options;
-		while (opt->name) {
-			if (!strncmp(str, opt->name, strlen(opt->name))) {
-				acpi_opts |= opt->value;
-				break;
-			}
-			opt++;
-		}
-		str = strpbrk(str, ",");
-		if (str)
-			str += strspn(str, ",");
-	}
-
-	if (acpi_opts)
-		printk(KERN_INFO "ACPI: options 0x%08lx\n", acpi_opts);
-
-	return 1;
-}
-
-/*
- * kernel/module command line interfaces are both "acpi=OPTION,OPTION,..."
- */
-__setup("acpi=", acpi_setup);
-
-static char * __initdata acpi = NULL;
-
-MODULE_DESCRIPTION("ACPI driver");
-MODULE_PARM(acpi, "s");
-MODULE_PARM_DESC(acpi, "ACPI driver command line");
-
-/*
- * Initialize and enable ACPI
- */
-int __init acpi_init(void)
-{
-	struct acpi_facp *facp = NULL;
-
-	if (acpi)
-		acpi_setup(acpi);
-
-	if (acpi_opts & ACPI_DISABLED) {
-		return -ENODEV;
-	}
-	else if (acpi_opts & ACPI_TABLES_ONLY) {
-		if (acpi_find_tables())
-			return -ENODEV;
-	}
-	else if (acpi_opts & ACPI_CHIPSET_ONLY) {
-		if (acpi_find_chipset())
-			return -ENODEV;
-	}
-	else {
-		switch (acpi_find_tables()) {
-		case 0:
-			// found valid ACPI tables
-			break;
-		case -ENODEV:
-			// found no ACPI tables, try chipset-specific
-			if (acpi_find_chipset())
-				return -ENODEV;
-			break;
-		default:
-			// found broken ACPI tables
-			return -ENODEV;
-		}
-	}
-
-	facp = (struct acpi_facp*) acpi_facp.table;
-
-	if (PM_IS_ACTIVE()) {
-		printk(KERN_NOTICE "acpi: APM is already active.\n");
-		goto err_out;
-	}
-	pm_active = 1;
-
-	/*
-	 * Internally we always keep latencies in timer
-	 * ticks, which is simpler and more consistent (what is
-	 * an uS to us?). Besides, that gives people more
-	 * control in the /proc interfaces.
-	 */
-	if (facp->p_lvl2_lat
-	    && facp->p_lvl2_lat <= ACPI_MAX_P_LVL2_LAT
-	    && !acpi_verify_mod(ACPI_P_LVL2_LAT)) {
-		acpi_p_lvl2_lat = ACPI_uS_TO_TMR_TICKS(facp->p_lvl2_lat);
-		acpi_enter_lvl2_lat = ACPI_uS_TO_TMR_TICKS(ACPI_TMR_HZ / 1000);
-	}
-	if (facp->p_lvl3_lat
-	    && facp->p_lvl3_lat <= ACPI_MAX_P_LVL3_LAT
-	    && !acpi_verify_mod(ACPI_P_LVL3_LAT)) {
-		acpi_p_lvl3_lat = ACPI_uS_TO_TMR_TICKS(facp->p_lvl3_lat);
-		acpi_enter_lvl3_lat
-			= ACPI_uS_TO_TMR_TICKS(facp->p_lvl3_lat * 5);
-	}
-
-	if (acpi_claim_ioports(facp)) {
-		printk(KERN_ERR "ACPI: I/O port allocation failed\n");
-		goto err_out;
-	}
-
-	if (facp->sci_int
-	    && acpi_sci_enabled()
-	    && request_irq(facp->sci_int,
-			   acpi_irq,
-			   SA_INTERRUPT | SA_SHIRQ,
-			   "acpi",
-			   &acpi_facp)) {
-		printk(KERN_ERR "ACPI: SCI (IRQ%d) allocation failed\n",
-		       facp->sci_int);
-		goto cleanup_ioports;
-	}
-
-#ifndef CONFIG_ACPI_S1_SLEEP
-	acpi_opts |= ACPI_S1_DISABLED;
-#endif
-
-	acpi_sysctl = register_sysctl_table(acpi_dir_table, 1);
-	if (!acpi_sysctl)
-		goto cleanup_irq;
-
-	pm_power_off = acpi_power_off;
-
-	/*
-	 * Set up the ACPI idle function. Note that we can't really
-	 * do this with multiple CPU's, we'd need a per-CPU ACPI
-	 * device..
-	 */
-#ifdef CONFIG_SMP
-	if (smp_num_cpus > 1)
-		return 0;
-#endif
-
-	if (facp->pm_tmr)
-		pm_idle = acpi_idle;
-
-	return 0;
-cleanup_irq:
-    free_irq(facp->sci_int, &acpi_facp);
-cleanup_ioports:
-    acpi_release_ioports(facp);
-err_out:
-	if (pci_driver_registered)
-		pci_unregister_driver(&acpi_driver);
-	acpi_destroy_tables();
-
-	return -ENODEV;
-}
-
-/*
- * Disable and deinitialize ACPI
- */
-void __exit acpi_exit(void)
-{
-	struct acpi_facp *facp = (struct acpi_facp*) acpi_facp.table;
-
-	pm_idle = NULL;
-	pm_power_off = NULL;
-
-	unregister_sysctl_table(acpi_sysctl);
-	acpi_disable(facp);
-	acpi_release_ioports(facp);
-
-	if (facp->sci_int && acpi_sci_enabled())
-		free_irq(facp->sci_int, &acpi_facp);
-
-	acpi_destroy_tables();
-
-	if (pci_driver_registered)
-		pci_unregister_driver(&acpi_driver);
-
-	pm_active = 0;
-}
-
-module_init(acpi_init);
-module_exit(acpi_exit);
diff --git a/arch/i386/kernel/bluesmoke.c b/arch/i386/kernel/bluesmoke.c
index 59826db68..c76754af2 100644
--- a/arch/i386/kernel/bluesmoke.c
+++ b/arch/i386/kernel/bluesmoke.c
@@ -75,7 +75,7 @@ void mcheck_init(struct cpuinfo_x86 *c)
 	if( c->x86_vendor != X86_VENDOR_INTEL )
 		return;
 	
-	if( !test_bit(X86_FEATURE_TSC, &c->x86_capability) )
+	if( !test_bit(X86_FEATURE_MCE, &c->x86_capability) )
 		return;
 		
 	if( !test_bit(X86_FEATURE_MCA, &c->x86_capability) )
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
index 73b41b215..fe6528460 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -153,6 +153,7 @@ int __init cpuid_init(void)
 
 void __exit cpuid_exit(void)
 {
+  unregister_chrdev(CPUID_MAJOR, "cpu/cpuid");
 }
 
 module_init(cpuid_init);
diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c
index b439568c1..8d5a9efb3 100644
--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/arch/i386/kernel/ldt.c b/arch/i386/kernel/ldt.c
index e3b5c2f75..e94cbfbdc 100644
--- a/arch/i386/kernel/ldt.c
+++ b/arch/i386/kernel/ldt.c
@@ -31,7 +31,7 @@ static int read_ldt(void * ptr, unsigned long bytecount)
 	struct mm_struct * mm = current->mm;
 
 	err = 0;
-	if (!mm->segments)
+	if (!mm->context.segments)
 		goto out;
 
 	size = LDT_ENTRIES*LDT_ENTRY_SIZE;
@@ -39,7 +39,7 @@ static int read_ldt(void * ptr, unsigned long bytecount)
 		size = bytecount;
 
 	err = size;
-	if (copy_to_user(ptr, mm->segments, size))
+	if (copy_to_user(ptr, mm->context.segments, size))
 		err = -EFAULT;
 out:
 	return err;
@@ -87,13 +87,12 @@ static int write_ldt(void * ptr, unsigned long bytecount, int oldmode)
 	 * limited by MAX_LDT_DESCRIPTORS.
 	 */
 	down(&mm->mmap_sem);
-	if (!mm->segments) {
-		
+	if (!mm->context.segments) {
 		error = -ENOMEM;
-		mm->segments = vmalloc(LDT_ENTRIES*LDT_ENTRY_SIZE);
-		if (!mm->segments)
+		mm->context.segments = vmalloc(LDT_ENTRIES*LDT_ENTRY_SIZE);
+		if (!mm->context.segments)
 			goto out_unlock;
-		memset(mm->segments, 0, LDT_ENTRIES*LDT_ENTRY_SIZE);
+		memset(mm->context.segments, 0, LDT_ENTRIES*LDT_ENTRY_SIZE);
 		
 		if (atomic_read(&mm->mm_users) > 1)
 			printk(KERN_WARNING "LDT allocated for cloned task!\n");
@@ -104,7 +103,7 @@ static int write_ldt(void * ptr, unsigned long bytecount, int oldmode)
 		load_LDT(mm);
 	}
 
-	lp = (__u32 *) ((ldt_info.entry_number << 3) + (char *) mm->segments);
+	lp = (__u32 *) ((ldt_info.entry_number << 3) + (char *) mm->context.segments);
 
    	/* Allow LDTs to be cleared by the user. */
    	if (ldt_info.base_addr == 0 && ldt_info.limit == 0) {
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
index badb6ed15..fd8cf7088 100644
--- a/arch/i386/kernel/msr.c
+++ b/arch/i386/kernel/msr.c
@@ -261,6 +261,7 @@ int __init msr_init(void)
 
 void __exit msr_exit(void)
 {
+  unregister_chrdev(MSR_MAJOR, "cpu/msr");
 }
 
 module_init(msr_init);
diff --git a/arch/i386/kernel/pci-irq.c b/arch/i386/kernel/pci-irq.c
index cdf4fc827..af0757e01 100644
--- a/arch/i386/kernel/pci-irq.c
+++ b/arch/i386/kernel/pci-irq.c
@@ -325,6 +325,30 @@ static int pirq_vlsi_set(struct pci_dev *router, struct pci_dev *dev, int pirq,
 	return 1;
 }
 
+/*
+ * ServerWorks: PCI interrupts mapped to system IRQ lines through Index
+ * and Redirect I/O registers (0x0c00 and 0x0c01).  The Index register
+ * format is (PCIIRQ## | 0x10), e.g.: PCIIRQ10=0x1a.  The Redirect
+ * register is a straight binary coding of desired PIC IRQ (low nibble).
+ *
+ * The 'link' value in the PIRQ table is already in the correct format
+ * for the Index register.  There are some special index values:
+ * 0x00 for ACPI (SCI), 0x01 for USB, 0x02 for IDE0, 0x04 for IDE1,
+ * and 0x03 for SMBus.
+ */
+static int pirq_serverworks_get(struct pci_dev *router, struct pci_dev *dev, int pirq)
+{
+	outb_p(pirq, 0xc00);
+	return inb(0xc01) & 0xf;
+}
+
+static int pirq_serverworks_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
+{
+	outb_p(pirq, 0xc00);
+	outb_p(irq, 0xc01);
+	return 1;
+}
+
 #ifdef CONFIG_PCI_BIOS
 
 static int pirq_bios_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
@@ -357,6 +381,9 @@ static struct irq_router pirq_routers[] = {
 	{ "NatSemi", PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520, pirq_cyrix_get, pirq_cyrix_set },
 	{ "SIS", PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503, pirq_sis_get, pirq_sis_set },
 	{ "VLSI 82C534", PCI_VENDOR_ID_VLSI, PCI_DEVICE_ID_VLSI_82C534, pirq_vlsi_get, pirq_vlsi_set },
+	{ "ServerWorks", PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4,
+	  pirq_serverworks_get, pirq_serverworks_set },
+
 	{ "default", 0, 0, NULL, NULL }
 };
 
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 8e7176c32..ab052e2ff 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -414,13 +414,13 @@ void show_regs(struct pt_regs * regs)
  */
 void release_segments(struct mm_struct *mm)
 {
-	void * ldt = mm->segments;
+	void * ldt = mm->context.segments;
 
 	/*
 	 * free the LDT
 	 */
 	if (ldt) {
-		mm->segments = NULL;
+		mm->context.segments = NULL;
 		clear_LDT();
 		vfree(ldt);
 	}
@@ -478,7 +478,7 @@ void flush_thread(void)
 void release_thread(struct task_struct *dead_task)
 {
 	if (dead_task->mm) {
-		void * ldt = dead_task->mm->segments;
+		void * ldt = dead_task->mm->context.segments;
 
 		// temporary debugging check
 		if (ldt) {
@@ -495,27 +495,22 @@ void release_thread(struct task_struct *dead_task)
  */
 void copy_segments(struct task_struct *p, struct mm_struct *new_mm)
 {
-	struct mm_struct * old_mm = current->mm;
-	void * old_ldt = old_mm->segments, * ldt;
+	struct mm_struct * old_mm;
+	void *old_ldt, *ldt;
 
-	if (!old_ldt) {
+	ldt = NULL;
+	old_mm = current->mm;
+	if (old_mm && (old_ldt = old_mm->context.segments) != NULL) {
 		/*
-		 * default LDT - use the one from init_task
+		 * Completely new LDT, we initialize it from the parent:
 		 */
-		new_mm->segments = NULL;
-		return;
+		ldt = vmalloc(LDT_ENTRIES*LDT_ENTRY_SIZE);
+		if (!ldt)
+			printk(KERN_WARNING "ldt allocation failed\n");
+		else
+			memcpy(ldt, old_ldt, LDT_ENTRIES*LDT_ENTRY_SIZE);
 	}
-
-	/*
-	 * Completely new LDT, we initialize it from the parent:
-	 */
-	ldt = vmalloc(LDT_ENTRIES*LDT_ENTRY_SIZE);
-	if (!ldt)
-		printk(KERN_WARNING "ldt allocation failed\n");
-	else
-		memcpy(ldt, old_ldt, LDT_ENTRIES*LDT_ENTRY_SIZE);
-	new_mm->segments = ldt;
-	return;
+	new_mm->context.segments = ldt;
 }
 
 /*
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index fffe11398..09aa4a08c 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -477,7 +477,7 @@ static int __init copy_e820_map(struct e820entry * biosmap, int nr_map)
 			if (start < 0x100000ULL && end > 0xA0000ULL) {
 				if (start < 0xA0000ULL)
 					add_memory_region(start, 0xA0000ULL-start, type);
-				if (end < 0x100000ULL)
+				if (end <= 0x100000ULL)
 					continue;
 				start = 0x100000ULL;
 				size = end - start;
@@ -518,7 +518,7 @@ void __init setup_memory_region(void)
 
 		e820.nr_map = 0;
 		add_memory_region(0, LOWMEMSIZE(), E820_RAM);
-		add_memory_region(HIGH_MEMORY, mem_size << 10, E820_RAM);
+		add_memory_region(HIGH_MEMORY, (mem_size << 10) - HIGH_MEMORY, E820_RAM);
   	}
 	printk("BIOS-provided physical RAM map:\n");
 	print_memory_map(who);
@@ -1149,7 +1149,7 @@ static void __init check_cx686_slop(struct cpuinfo_x86 *c)
 		if (ccr5 & 2) { /* possible wrong calibration done */
 			printk(KERN_INFO "Recalibrating delay loop with SLOP bit reset\n");
 			calibrate_delay();
-			c->loops_per_sec = loops_per_sec;
+			c->loops_per_jiffy = loops_per_jiffy;
 		}
 	}
 }
@@ -1553,7 +1553,7 @@ static void __init init_intel(struct cpuinfo_x86 *c)
 						/* L1 D cache */
 						l1d += 16;
 						break;
-					default:
+					default:;
 						/* TLB, or unknown */
 					}
 					break;
@@ -1884,7 +1884,7 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
 	int junk, i;
 	u32 xlvl, tfms;
 
-	c->loops_per_sec = loops_per_sec;
+	c->loops_per_jiffy = loops_per_jiffy;
 	c->x86_cache_size = -1;
 	c->x86_vendor = X86_VENDOR_UNKNOWN;
 	c->cpuid_level = -1;	/* CPUID not detected */
@@ -2188,8 +2188,8 @@ int get_cpuinfo(char * buffer)
 				p += sprintf(p, " %s", x86_cap_flags[i]);
 
 		p += sprintf(p, "\nbogomips\t: %lu.%02lu\n\n",
-			(c->loops_per_sec+2500)/500000,
-			((c->loops_per_sec+2500)/5000) % 100);
+			     c->loops_per_jiffy/(500000/HZ),
+			     (c->loops_per_jiffy/(5000/HZ)) % 100);
 	}
 	return p - buffer;
 }
diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c
index f39e42522..6607edf8a 100644
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
@@ -278,7 +278,16 @@ asmlinkage void smp_invalidate_interrupt (void)
 	unsigned long cpu = smp_processor_id();
 
 	if (!test_bit(cpu, &flush_cpumask))
-		BUG();
+		return;
+		/* 
+		 * This was a BUG() but until someone can quote me the
+		 * line from the intel manual that guarantees an IPI to
+		 * multiple CPUs is retried _only_ on the erroring CPUs
+		 * its staying as a return
+		 *
+		 * BUG();
+		 */
+		 
 	if (flush_mm == cpu_tlbstate[cpu].active_mm) {
 		if (cpu_tlbstate[cpu].state == TLBSTATE_OK) {
 			if (flush_va == FLUSH_ALL)
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 858e7dda0..aab31e839 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -694,6 +694,11 @@ static void __init do_boot_cpu (int apicid)
 		apic_write_around(APIC_ICR, APIC_DM_STARTUP
 					| (start_eip >> 12));
 
+		/*
+		 * Give the other CPU some time to accept the IPI.
+		 */
+		udelay(300);
+
 		Dprintk("Startup point 1.\n");
 
 		Dprintk("Waiting for send to finish...\n");
@@ -979,11 +984,11 @@ void __init smp_boot_cpus(void)
 		unsigned long bogosum = 0;
 		for (cpu = 0; cpu < NR_CPUS; cpu++)
 			if (cpu_online_map & (1<<cpu))
-				bogosum += cpu_data[cpu].loops_per_sec;
+				bogosum += cpu_data[cpu].loops_per_jiffy;
 		printk(KERN_INFO "Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
 			cpucount+1,
-			(bogosum+2500)/500000,
-			((bogosum+2500)/5000)%100);
+			bogosum/(500000/HZ),
+			(bogosum/(5000/HZ))%100);
 		Dprintk("Before bogocount - setting activated=1.\n");
 	}
 	smp_num_cpus = cpucount + 1;
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 12ba21b92..c7672ceed 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -105,7 +105,7 @@ static inline unsigned long do_fast_gettimeoffset(void)
 
 	__asm__("mull %2"
 		:"=a" (eax), "=d" (edx)
-		:"g" (fast_gettimeoffset_quotient),
+		:"rm" (fast_gettimeoffset_quotient),
 		 "0" (eax));
 
 	/* our adjusted time offset in microseconds */
diff --git a/arch/i386/lib/Makefile b/arch/i386/lib/Makefile
index abafc528d..bfb9ae050 100644
--- a/arch/i386/lib/Makefile
+++ b/arch/i386/lib/Makefile
@@ -6,16 +6,12 @@
 	$(CC) $(AFLAGS) -c $< -o $*.o
 
 L_TARGET = lib.a
-L_OBJS  = checksum.o old-checksum.o delay.o \
+
+obj-y = checksum.o old-checksum.o delay.o \
 	usercopy.o getuser.o putuser.o iodebug.o \
 	memcpy.o
 
-ifdef CONFIG_X86_USE_3DNOW
-L_OBJS += mmx.o
-endif
-
-ifdef CONFIG_HAVE_DEC_LOCK
-L_OBJS += dec_and_lock.o
-endif
+obj-$(CONFIG_X86_USE_3DNOW) += mmx.o
+obj-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/i386/lib/delay.c b/arch/i386/lib/delay.c
index 89e7940ad..1b77d942d 100644
--- a/arch/i386/lib/delay.c
+++ b/arch/i386/lib/delay.c
@@ -24,8 +24,7 @@ int x86_udelay_tsc = 0;		/* Delay via TSC */
 	
 /*
  *	Do a udelay using the TSC for any CPU that happens
- *	to have one that we trust. This could be optimised to avoid
- *	the multiply per loop but its a delay loop so who are we kidding...
+ *	to have one that we trust.
  */
 
 static void __rdtsc_delay(unsigned long loops)
@@ -70,8 +69,8 @@ inline void __const_udelay(unsigned long xloops)
 	int d0;
 	__asm__("mull %0"
 		:"=d" (xloops), "=&a" (d0)
-		:"1" (xloops),"0" (current_cpu_data.loops_per_sec));
-        __delay(xloops);
+		:"1" (xloops),"0" (current_cpu_data.loops_per_jiffy));
+        __delay(xloops * HZ);
 }
 
 void __udelay(unsigned long usecs)
diff --git a/arch/i386/math-emu/Makefile b/arch/i386/math-emu/Makefile
index 5564d8712..9b489779c 100644
--- a/arch/i386/math-emu/Makefile
+++ b/arch/i386/math-emu/Makefile
@@ -2,7 +2,7 @@
 #               Makefile for wm-FPU-emu
 #
 
-L_TARGET := math.a
+O_TARGET := math.o
 
 #DEBUG	= -DDEBUGGING
 DEBUG	=
@@ -27,7 +27,7 @@ A_OBJS =reg_u_add.o reg_u_div.o reg_u_mul.o reg_u_sub.o \
 	div_Xsig.o polynom_Xsig.o round_Xsig.o \
 	shr_Xsig.o mul_Xsig.o
 
-L_OBJS =$(C_OBJS) $(A_OBJS)
+obj-y =$(C_OBJS) $(A_OBJS)
 
 include $(TOPDIR)/Rules.make
 
diff --git a/arch/i386/math-emu/fpu_system.h b/arch/i386/math-emu/fpu_system.h
index 3cda85f65..1da2e1ff9 100644
--- a/arch/i386/math-emu/fpu_system.h
+++ b/arch/i386/math-emu/fpu_system.h
@@ -20,7 +20,7 @@
    of the stack frame of math_emulate() */
 #define SETUP_DATA_AREA(arg)	FPU_info = (struct info *) &arg
 
-#define LDT_DESCRIPTOR(s)	(((struct desc_struct *)current->mm->segments)[(s) >> 3])
+#define LDT_DESCRIPTOR(s)	(((struct desc_struct *)current->mm->context.segments)[(s) >> 3])
 #define SEG_D_SIZE(x)		((x).b & (3 << 21))
 #define SEG_G_BIT(x)		((x).b & (1 << 23))
 #define SEG_GRANULARITY(x)	(((x).b & (1 << 23)) ? 4096 : 1)
diff --git a/arch/i386/mm/Makefile b/arch/i386/mm/Makefile
index cee7d4e6d..73e25bd30 100644
--- a/arch/i386/mm/Makefile
+++ b/arch/i386/mm/Makefile
@@ -8,6 +8,7 @@
 # Note 2! The CFLAGS definition is now in the main makefile...
 
 O_TARGET := mm.o
-O_OBJS	 := init.o fault.o ioremap.o extable.o
+
+obj-y	 := init.o fault.o ioremap.o extable.o
 
 include $(TOPDIR)/Rules.make