Merge http://linux.bkbits.net/linux-2.5

into suse.cz:/home/perex/bk/linux-sound/linux-sound

CREDITS

@@ -1272,11 +1272,13 @@ S: Germany
 
 N: Christoph Hellwig
 E: hch@infradead.org
-D: misc driver & makefile hacking
+E: hch@sgi.com
+D: all kinds of driver, filesystem & core kernel hacking
 D: freevxfs driver
 D: sysvfs maintainer
-S: Triftstrae 26
-S: 38644 Goslar
+D: chief codingstyle nitpicker
+S: Auweg 38
+S: 85748 Garching
 S: Germany
 
 N: Richard Henderson

Documentation/sysctl/kernel.txt

@@ -237,11 +237,6 @@ the different loglevels.
   console_loglevel can be set
 - default_console_loglevel: default value for console_loglevel
 
-Note: a quick look in linux/kernel/printk.c will reveal that
-these variables aren't put inside a structure, so their order
-in-core isn't formally guaranteed and garbage values _might_
-occur when the compiler changes. (???)
-
 ==============================================================
 
 reboot-cmd: (Sparc only)

Makefile

 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 51
+SUBLEVEL = 52
 EXTRAVERSION =
 
 # *DOCUMENTATION*

Rules.make

-

arch/alpha/kernel/Makefile

@@ -92,5 +92,3 @@ obj-y    += irq_pyxis.o
 endif
 
 endif # GENERIC
-
-include $(TOPDIR)/Rules.make

arch/alpha/lib/Makefile

@@ -49,8 +49,6 @@ obj-y =	__divqu.o __remqu.o __divlu.o __remlu.o \
 
 obj-$(CONFIG_SMP) += dec_and_lock.o
 
-include $(TOPDIR)/Rules.make
-
 $(obj)/__divqu.o: $(obj)/$(ev6)divide.S
 	$(CC) $(AFLAGS) -DDIV -c -o $(obj)/__divqu.o $(obj)/$(ev6)divide.S
 

arch/alpha/math-emu/Makefile

@@ -5,5 +5,3 @@
 CFLAGS += -I. -I$(TOPDIR)/include/math-emu -w
 
 obj-$(CONFIG_MATHEMU) += math.o qrnnd.o
-
-include $(TOPDIR)/Rules.make

arch/alpha/mm/Makefile

@@ -5,5 +5,3 @@
 obj-y	:= init.o fault.o extable.o
 
 obj-$(CONFIG_DISCONTIGMEM) += numa.o
-
-include $(TOPDIR)/Rules.make

arch/arm/kernel/Makefile

@@ -40,8 +40,6 @@ endif
 
 EXTRA_TARGETS := $(head-y) init_task.o
 
-include $(TOPDIR)/Rules.make
-
 # Spell out some dependencies that `make dep' doesn't spot
 $(obj)/entry-armv.o: 	$(obj)/entry-header.S include/asm-arm/constants.h
 $(obj)/entry-armo.o: 	$(obj)/entry-header.S include/asm-arm/constants.h

arch/arm/lib/Makefile

@@ -41,8 +41,6 @@ obj-y		+= io-writesl.o
 
 obj-$(CONFIG_CPU_26) += uaccess-armo.o
 
-include $(TOPDIR)/Rules.make
-
 $(obj)/csumpartialcopy.o:	$(obj)/csumpartialcopygeneric.S
 $(obj)/csumpartialcopyuser.o:	$(obj)/csumpartialcopygeneric.S
 

arch/arm/mach-adifcc/Makefile

@@ -10,5 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:=
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-anakin/Makefile

@@ -10,5 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-arc/Makefile

@@ -17,5 +17,3 @@ obj-$(CONFIG_DEBUG_LL)	+= debug.o
 EXTRA_TARGETS 		:= head.o
 
 AFLAGS_head.o		:= -DTEXTADDR=$(TEXTADDR)
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-clps711x/Makefile

@@ -18,5 +18,3 @@ obj-$(CONFIG_ARCH_FORTUNET) += fortunet.o
 obj-$(CONFIG_ARCH_P720T)    += p720t.o
 leds-$(CONFIG_ARCH_P720T)   += p720t-leds.o
 obj-$(CONFIG_LEDS)          += $(leds-y)
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-clps7500/Makefile

@@ -10,5 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-ebsa110/Makefile

@@ -12,5 +12,3 @@ obj-			:=
 export-objs		:= io.o
 
 obj-$(CONFIG_LEDS)	+= leds.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-epxa10db/Makefile

@@ -10,6 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-footbridge/Makefile

@@ -25,5 +25,3 @@ obj-$(CONFIG_ARCH_NETWINDER) += netwinder-hw.o
 
 obj-$(CONFIG_PCI)	+=$(pci-y)
 obj-$(CONFIG_LEDS)	+=$(leds-y)
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-ftvpci/Makefile

@@ -13,5 +13,3 @@ export-objs		:=
 
 obj-$(CONFIG_PCI)	+= pci.o
 obj-$(CONFIG_LEDS)	+= leds.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-integrator/Makefile

@@ -11,5 +11,3 @@ obj-			:=
 
 obj-$(CONFIG_LEDS)	+= leds.o
 obj-$(CONFIG_PCI)	+= pci_v3.o pci.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-integrator/cpu.c

@@ -77,8 +77,8 @@ static int integrator_verify_speed(struct cpufreq_policy *policy)
 {
 	struct vco vco;
 
-	if (policy->max > policy->max_cpu_freq)
-		policy->max = policy->max_cpu_freq;
+	if (policy->max > policy->cpuinfo.max_freq)
+		policy->max = policy->cpuinfo.max_freq;
 
 	if (policy->max < 12000)
 		policy->max = 12000;
@@ -148,7 +148,9 @@ static int integrator_set_policy(struct cpufreq_policy *policy)
 static struct cpufreq_policy integrator_policy = {
 	.cpu		= 0,
 	.policy		= CPUFREQ_POLICY_POWERSAVE,
-	.max_cpu_freq	= 160000,
+	.cpuinfo.max_cpu_freq	= 160000,
+	.cpuinfo.min_cpu_freq   = 12000,
+	.cpuinfo.transition_latency  = CPUFREQ_ETERNAL,
 };
 
 static struct cpufreq_driver integrator_driver = {
@@ -197,7 +199,9 @@ static int __init integrator_cpu_init(void)
 
 		policies[cpu].cpu = cpu;
 		policies[cpu].policy = CPUFREQ_POLICY_POWERSAVE,
-		policies[cpu].max_cpu_freq = 160000;
+		policies[cpu].cpuinfo.max_freq = 160000;
+		policies[cpu].cpuinfo.min_freq = 12000;
+		policies[cpu].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 		policies[cpu].min =
 		policies[cpu].max = vco_to_freq(vco, 1);
 	}
@@ -205,8 +209,6 @@ static int __init integrator_cpu_init(void)
 	set_cpus_allowed(current, cpus_allowed);
 
 #ifdef CONFIG_CPU_FREQ
-	for (cpu=0; cpu<NR_CPUS; cpu++)
-		integrator_driver.cpu_min_freq[cpu] = 12000;
 	integrator_driver.policy = policies;
 	cpufreq_register(&integrator_driver);
 #else

arch/arm/mach-iop310/Makefile

@@ -22,5 +22,3 @@ obj-$(CONFIG_IOP310_AAU) += aau.o
 obj-$(CONFIG_IOP310_DMA) += dma.o
 obj-$(CONFIG_IOP310_MU) += message.o
 obj-$(CONFIG_IOP310_PMON) += pmon.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-l7200/Makefile

@@ -10,5 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-pxa/Makefile

@@ -21,5 +21,3 @@ obj-$(CONFIG_LEDS) += $(leds-y)
 
 # Misc features
 obj-$(CONFIG_PM) += pm.o sleep.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-rpc/Makefile

@@ -10,6 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-sa1100/Makefile

@@ -108,5 +108,3 @@ obj-$(CONFIG_LEDS) += $(led-y)
 
 # Miscelaneous functions
 obj-$(CONFIG_PM) += pm.o sleep.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-sa1100/cpu-sa1100.c

@@ -203,14 +203,15 @@ static int sa1100_setspeed(struct cpufreq_policy *policy)
 static struct cpufreq_policy sa1100_policy = {
 	.cpu		= 0,
 	.policy		= CPUFREQ_POLICY_POWERSAVE,
-	.max_cpu_freq	= 287000,
+	.cpuinfo.max_freq	= 287000,
+	.cpuinfo.min_freq	= 59000,
+	.cpuinfo.transition_latency	= CPUFREQ_ETERNAL,
 };
 
 static struct cpufreq_driver sa1100_driver = {
 	.verify		= sa11x0_verify_speed,
 	.setpolicy	= sa1100_setspeed,
 	.policy		= &sa1100_policy,
-	.cpu_min_freq[0]= 59000,
 };
 
 static int __init sa1100_dram_init(void)

arch/arm/mach-sa1100/cpu-sa1110.c

@@ -298,14 +298,15 @@ static int sa1110_setspeed(struct cpufreq_policy *policy)
 static struct cpufreq_policy sa1110_policy = {
 	.cpu		= 0,
 	.policy		= CPUFREQ_POLICY_POWERSAVE,
-	.max_cpu_freq	= 287000,
+	.cpuinfo.max_freq	= 287000,
+	.cpuinfo.min_freq	= 59000,
+	.cpuinfo.transition_latency	= CPUFREQ_ETERNAL,
 };
 
 static struct cpufreq_driver sa1110_driver = {
 	.verify		 = sa11x0_verify_speed,
 	.setpolicy	 = sa1110_setspeed,
 	.policy		 = &sa1110_policy,
-	.cpu_min_freq	 = { 59000, },
 };
 
 static int __init sa1110_clk_init(void)

arch/arm/mach-sa1100/generic.c

@@ -69,8 +69,8 @@ unsigned int sa11x0_freq_to_ppcr(unsigned int khz)
  */
 int sa11x0_verify_speed(struct cpufreq_policy *policy)
 {
-	if (policy->max > policy->max_cpu_freq)
-		policy->max = policy->max_cpu_freq;
+	if (policy->max > policy->cpuinfo.max_freq)
+		policy->max = policy->cpuinfo.max_freq;
 
 	policy->max = cclk_frequency_100khz[sa11x0_freq_to_ppcr(policy->max)] * 100;
 	policy->min = policy->max;

arch/arm/mach-shark/Makefile

@@ -12,5 +12,3 @@ obj-			:=
 export-objs		:= 
 
 obj-$(CONFIG_LEDS)	+= leds.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-tbox/Makefile

@@ -10,5 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-include $(TOPDIR)/Rules.make

arch/arm/mm/Makefile

@@ -38,5 +38,3 @@ p-$(CONFIG_CPU_ARM926T)	+= proc-arm926.o  tlb-v4wbi.o copypage-v4wb.o abort-ev5t
 p-$(CONFIG_CPU_XSCALE)	+= proc-xscale.o  tlb-v4wbi.o copypage-xscale.o abort-xscale.o minicache.o
 
 obj-y		+= $(sort $(p-y))
-
-include $(TOPDIR)/Rules.make

arch/arm/nwfpe/Makefile

@@ -17,5 +17,3 @@ nwfpe-objs		+= entry26.o
 else
 nwfpe-objs		+= entry.o
 endif
-
-include $(TOPDIR)/Rules.make

arch/cris/drivers/Makefile

@@ -14,6 +14,3 @@ obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL)  += sync_serial.o
 obj-$(CONFIG_ETRAX_PARPORT)             += parport.o
 obj-$(CONFIG_ETRAX_DS1302)              += ds1302.o
 obj-$(CONFIG_ETRAX_ETHERNET_LPSLAVE)    += lpslave
-
-include $(TOPDIR)/Rules.make
-

arch/cris/drivers/lpslave/Makefile

@@ -4,8 +4,6 @@
 
 obj-y = e100lpslavenet.o e100lpslave_code.o
 
-include $(TOPDIR)/Rules.make
-
 e100lpslave_code.o:	e100lpslave.o e100lpslaveld 
 	$(CROSS_COMPILE)ld -qmagic -Te100lpslaveld e100lpslave.o -o e100lpslave
 	$(CROSS_COMPILE)objcopy -O binary --remove-section=.data --remove-section=.bss e100lpslave e100lpslave.text

arch/cris/kernel/Makefile

@@ -21,5 +21,3 @@ entryoffsets.s: entryoffsets.c
 	$(CC) $(CFLAGS) -S -c $<
 
 clean:
-
-include $(TOPDIR)/Rules.make

arch/cris/lib/Makefile

@@ -7,5 +7,3 @@ L_TARGET = lib.a
 EXTRA_AFLAGS := -traditional
 
 obj-y  = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o
-
-include $(TOPDIR)/Rules.make

arch/cris/mm/Makefile

@@ -3,5 +3,3 @@
 #
 
 obj-y	 := init.o fault.o tlb.o extable.o ioremap.o
-
-include $(TOPDIR)/Rules.make

arch/i386/Kconfig

@@ -465,104 +465,6 @@ config X86_MCE_P4THERMAL
 	  Enabling this feature will cause a message to be printed when the P4
 	  enters thermal throttling.
 
-config CPU_FREQ
-	bool "CPU Frequency scaling"
-	help
-	  Clock scaling allows you to change the clock speed of CPUs on the
-	  fly. This is a nice method to save battery power on notebooks,
-	  because the lower the clock speed, the less power the CPU consumes.
-
-	  For more information, take a look at linux/Documentation/cpufreq or
-	  at <http://www.brodo.de/cpufreq/>
-
-	  If in doubt, say N.
-
-config CPU_FREQ_24_API
-	bool "/proc/sys/cpu/ interface (2.4. / OLD)"
-	depends on CPU_FREQ
-	help
-	  This enables the /proc/sys/cpu/ sysctl interface for controlling
-	  CPUFreq, as known from the 2.4.-kernel patches for CPUFreq. 2.5
-	  uses /proc/cpufreq instead. Please note that some drivers do not 
-	  work well with the 2.4. /proc/sys/cpu sysctl interface, so if in
-	  doubt, say N here.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config X86_POWERNOW_K6
-	tristate "AMD Mobile K6-2/K6-3 PowerNow!"
-	depends on CPU_FREQ
-	help
-	  This adds the CPUFreq driver for mobile AMD K6-2+ and mobile
-	  AMD K6-3+ processors.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config ELAN_CPUFREQ
-	tristate "AMD Elan"
-	depends on CPU_FREQ && MELAN
-	---help---
-	  This adds the CPUFreq driver for AMD Elan SC400 and SC410
-	  processors.
-
-	  You need to specify the processor maximum speed as boot
-	  parameter: elanfreq=maxspeed (in kHz) or as module
-	  parameter "max_freq".
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config X86_LONGHAUL
-	tristate "VIA Cyrix III Longhaul"
-	depends on CPU_FREQ
-	help
-	  This adds the CPUFreq driver for VIA Samuel/CyrixIII, 
-	  VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T 
-	  processors.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config X86_SPEEDSTEP
-	tristate "Intel Speedstep"
-	depends on CPU_FREQ
-	help
-	  This adds the CPUFreq driver for certain mobile Intel Pentium III
-	  (Coppermine), all mobile Intel Pentium III-M (Tulatin) and all
-	  mobile Intel Pentium 4 P4-Ms.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config X86_P4_CLOCKMOD
-	tristate "Intel Pentium 4 clock modulation"
-	depends on CPU_FREQ
-	help
-	  This adds the CPUFreq driver for Intel Pentium 4 / XEON
-	  processors.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config X86_LONGRUN
-	tristate "Transmeta LongRun"
-	depends on CPU_FREQ
-	help
-	  This adds the CPUFreq driver for Transmeta Crusoe processors which
-	  support LongRun.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
 config TOSHIBA
 	tristate "Toshiba Laptop support"
 	---help---
@@ -985,6 +887,104 @@ config APM_REAL_MODE_POWER_OFF
 	  a work-around for a number of buggy BIOSes. Switch this option on if
 	  your computer crashes instead of powering off properly.
 
+config CPU_FREQ
+	bool "CPU Frequency scaling"
+	help
+	  Clock scaling allows you to change the clock speed of CPUs on the
+	  fly. This is a nice method to save battery power on notebooks,
+	  because the lower the clock speed, the less power the CPU consumes.
+
+	  For more information, take a look at linux/Documentation/cpufreq or
+	  at <http://www.brodo.de/cpufreq/>
+
+	  If in doubt, say N.
+
+config CPU_FREQ_24_API
+	bool "/proc/sys/cpu/ interface (2.4. / OLD)"
+	depends on CPU_FREQ
+	help
+	  This enables the /proc/sys/cpu/ sysctl interface for controlling
+	  CPUFreq, as known from the 2.4.-kernel patches for CPUFreq. 2.5
+	  uses /proc/cpufreq instead. Please note that some drivers do not 
+	  work well with the 2.4. /proc/sys/cpu sysctl interface, so if in
+	  doubt, say N here.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config X86_POWERNOW_K6
+	tristate "AMD Mobile K6-2/K6-3 PowerNow!"
+	depends on CPU_FREQ
+	help
+	  This adds the CPUFreq driver for mobile AMD K6-2+ and mobile
+	  AMD K6-3+ processors.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config ELAN_CPUFREQ
+	tristate "AMD Elan"
+	depends on CPU_FREQ && MELAN
+	---help---
+	  This adds the CPUFreq driver for AMD Elan SC400 and SC410
+	  processors.
+
+	  You need to specify the processor maximum speed as boot
+	  parameter: elanfreq=maxspeed (in kHz) or as module
+	  parameter "max_freq".
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config X86_LONGHAUL
+	tristate "VIA Cyrix III Longhaul"
+	depends on CPU_FREQ
+	help
+	  This adds the CPUFreq driver for VIA Samuel/CyrixIII, 
+	  VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T 
+	  processors.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config X86_SPEEDSTEP
+	tristate "Intel Speedstep"
+	depends on CPU_FREQ
+	help
+	  This adds the CPUFreq driver for certain mobile Intel Pentium III
+	  (Coppermine), all mobile Intel Pentium III-M (Tulatin) and all
+	  mobile Intel Pentium 4 P4-Ms.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config X86_P4_CLOCKMOD
+	tristate "Intel Pentium 4 clock modulation"
+	depends on CPU_FREQ
+	help
+	  This adds the CPUFreq driver for Intel Pentium 4 / XEON
+	  processors.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config X86_LONGRUN
+	tristate "Transmeta LongRun"
+	depends on CPU_FREQ
+	help
+	  This adds the CPUFreq driver for Transmeta Crusoe processors which
+	  support LongRun.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
 endmenu
 
 

arch/i386/boot/compressed/Makefile

@@ -7,8 +7,6 @@
 EXTRA_TARGETS	:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
 EXTRA_AFLAGS	:= -traditional
 
-include $(TOPDIR)/Rules.make
-
 LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup_32
 
 $(obj)/vmlinux: $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE

arch/i386/kernel/Makefile

@@ -34,5 +34,3 @@ EXTRA_AFLAGS   := -traditional
 
 export-objs += scx200.o
 obj-$(CONFIG_SCx200)		+= scx200.o
-
-include $(TOPDIR)/Rules.make

arch/i386/kernel/acpi.c

@@ -448,10 +448,11 @@ acpi_boot_init (
 
 /* address in low memory of the wakeup routine. */
 unsigned long acpi_wakeup_address = 0;
+extern char wakeup_start, wakeup_end;
 
 extern unsigned long FASTCALL(acpi_copy_wakeup_routine(unsigned long));
 
-static void init_low_mapping(pgd_t *pgd, int pgd_ofs, int pgd_limit)
+static void init_low_mapping(pgd_t *pgd, int pgd_limit)
 {
 	int pgd_ofs = 0;
 
@@ -473,7 +474,8 @@ int acpi_save_state_mem (void)
 	panic("S3 and PAE do not like each other for now.");
 	return 1;
 #endif
-	init_low_mapping(swapper_pg_dir, 0, USER_PTRS_PER_PGD);
+	init_low_mapping(swapper_pg_dir, USER_PTRS_PER_PGD);
+	memcpy((void *) acpi_wakeup_address, &wakeup_start, &wakeup_end - &wakeup_start);
 	acpi_copy_wakeup_routine(acpi_wakeup_address);
 
 	return 0;
@@ -506,7 +508,6 @@ void acpi_restore_state_mem (void)
  */
 void __init acpi_reserve_bootmem(void)
 {
-	extern char wakeup_start, wakeup_end;
 	acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE);
 	if ((&wakeup_end - &wakeup_start) > PAGE_SIZE)
 		printk(KERN_CRIT "ACPI: Wakeup code way too big, will crash on attempt to suspend\n");

arch/i386/kernel/acpi_wakeup.S

@@ -239,20 +239,11 @@ bogus_magic2:
 #
 ENTRY(acpi_copy_wakeup_routine)
 
-	pushl	%esi
-	pushl	%edi
-
 	sgdt	saved_gdt
 	sidt	saved_idt
 	sldt	saved_ldt
 	str	saved_tss
 
-	movl	%eax, %edi
-	leal	wakeup_start, %esi
-	movl	$(wakeup_end - wakeup_start + 3) >> 2, %ecx
-
-	rep ;  movsl
-
 	movl    %cr3, %edx
 	movl    %edx, real_save_cr3 - wakeup_start (%eax)
 	movl    %cr4, %edx
@@ -265,10 +256,6 @@ ENTRY(acpi_copy_wakeup_routine)
 	movl	%edx, video_mode - wakeup_start (%eax)
 	movl	$0x12345678, real_magic - wakeup_start (%eax)
 	movl	$0x12345678, saved_magic
-
-	# restore the regs we used
-	popl	%edi
-	popl	%esi
 	ret
 
 .data

arch/i386/kernel/cpu/Makefile

@@ -17,6 +17,3 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
 
 obj-$(CONFIG_MTRR)	+= 	mtrr/
 obj-$(CONFIG_CPU_FREQ)	+=	cpufreq/
-
-
-include $(TOPDIR)/Rules.make

arch/i386/kernel/cpu/cpufreq/Makefile

@@ -4,5 +4,3 @@ obj-$(CONFIG_X86_SPEEDSTEP)	+= speedstep.o
 obj-$(CONFIG_X86_P4_CLOCKMOD)	+= p4-clockmod.o
 obj-$(CONFIG_ELAN_CPUFREQ)	+= elanfreq.o
 obj-$(CONFIG_X86_LONGRUN)	+= longrun.o  
-
-include $(TOPDIR)/Rules.make

arch/i386/kernel/cpu/cpufreq/elanfreq.c

@@ -296,7 +296,6 @@ static int __init elanfreq_init(void)
 		max_freq = elanfreq_get_cpu_frequency();
 
 #ifdef CONFIG_CPU_FREQ_24_API
-	driver->cpu_min_freq[0] = 1000;
 	driver->cpu_cur_freq[0] = elanfreq_get_cpu_frequency();
 #endif
 
@@ -307,7 +306,9 @@ static int __init elanfreq_init(void)
 	driver->policy[0].min    = 1000;
 	driver->policy[0].max    = max_freq;
 	driver->policy[0].policy = CPUFREQ_POLICY_PERFORMANCE;
-	driver->policy[0].max_cpu_freq  = max_freq;
+	driver->policy[0].cpuinfo.max_freq = max_freq;
+	driver->policy[0].cpuinfo.min_freq = min_freq;
+	driver->policy[0].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 
 	elanfreq_driver = driver;
 

arch/i386/kernel/cpu/cpufreq/longhaul.c

@@ -779,7 +779,6 @@ static int __init longhaul_init (void)
 	driver->policy = (struct cpufreq_policy *) (driver + 1);
 
 #ifdef CONFIG_CPU_FREQ_24_API
-	driver->cpu_min_freq[0] = (unsigned int) lowest_speed;
 	driver->cpu_cur_freq[0] = currentspeed;
 #endif
 
@@ -790,7 +789,9 @@ static int __init longhaul_init (void)
 	driver->policy[0].min = (unsigned int) lowest_speed;
 	driver->policy[0].max = (unsigned int) highest_speed;
 	driver->policy[0].policy = CPUFREQ_POLICY_PERFORMANCE;
-	driver->policy[0].max_cpu_freq = (unsigned int) highest_speed;
+	driver->policy[0].cpuinfo.min_freq = (unsigned int) lowest_speed;
+	driver->policy[0].cpuinfo.max_freq = (unsigned int) highest_speed;
+	driver->policy[0].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 
 	longhaul_driver = driver;
 

arch/i386/kernel/cpu/cpufreq/longrun.c

@@ -121,8 +121,9 @@ static int longrun_verify_policy(struct cpufreq_policy *policy)
 		return -EINVAL;
 
 	policy->cpu = 0;
-	cpufreq_verify_within_limits(policy, 0, 
-		longrun_driver->policy[0].max_cpu_freq);
+	cpufreq_verify_within_limits(policy, 
+		longrun_driver->policy[0].cpuinfo.min_freq, 
+		longrun_driver->policy[0].cpuinfo.max_freq);
 
 	return 0;
 }
@@ -247,12 +248,13 @@ static int __init longrun_init(void)
 		kfree(driver);
 		return -EIO;
 	}
-	driver->policy[0].max_cpu_freq  = longrun_high_freq;
+	driver->policy[0].cpuinfo.min_freq = longrun_low_freq;
+	driver->policy[0].cpuinfo.max_freq = longrun_high_freq;
+	driver->policy[0].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 
 	longrun_get_policy(&driver->policy[0]);
 
 #ifdef CONFIG_CPU_FREQ_24_API
-	driver->cpu_min_freq[0] = longrun_low_freq;
 	driver->cpu_cur_freq[0] = longrun_high_freq; /* dummy value */
 #endif
 

arch/i386/kernel/cpu/cpufreq/p4-clockmod.c

@@ -257,7 +257,6 @@ int __init cpufreq_p4_init(void)
 
 #ifdef CONFIG_CPU_FREQ_24_API
 	for (i=0;i<NR_CPUS;i++) {
-		driver->cpu_min_freq[i] = stock_freq / 8;
 		driver->cpu_cur_freq[i] = stock_freq;
 	}
 #endif
@@ -272,7 +271,10 @@ int __init cpufreq_p4_init(void)
 			driver->policy[i].min    = stock_freq / 8;
 		driver->policy[i].max    = stock_freq;
 		driver->policy[i].policy = CPUFREQ_POLICY_PERFORMANCE;
-		driver->policy[i].max_cpu_freq  = stock_freq;
+		driver->policy[i].cpuinfo.min_freq  = driver->policy[i].min;
+		driver->policy[i].cpuinfo.max_freq  = stock_freq;
+		driver->policy[i].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+
 		driver->policy[i].cpu    = i;
 	}
 

arch/i386/kernel/cpu/cpufreq/powernow-k6.c

@@ -242,7 +242,6 @@ static int __init powernow_k6_init(void)
 	driver->policy = (struct cpufreq_policy *) (driver + 1);
 
 #ifdef CONFIG_CPU_FREQ_24_API
-	driver->cpu_min_freq[0]  = busfreq * 20;
 	driver->cpu_cur_freq[0]  = busfreq * max_multiplier;
 #endif
 
@@ -253,7 +252,9 @@ static int __init powernow_k6_init(void)
 	driver->policy[0].min    = busfreq * 20;
 	driver->policy[0].max    = busfreq * max_multiplier;
 	driver->policy[0].policy = CPUFREQ_POLICY_PERFORMANCE;
-	driver->policy[0].max_cpu_freq  = busfreq * max_multiplier;
+	driver->policy[0].cpuinfo.max_freq = busfreq * max_multiplier;
+	driver->policy[0].cpuinfo.min_freq = busfreq * 20;
+	driver->policy[0].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 
 	powernow_driver = driver;
 

arch/i386/kernel/cpu/cpufreq/speedstep.c

@@ -693,7 +693,6 @@ static int __init speedstep_init(void)
 	driver->policy = (struct cpufreq_policy *) (driver + 1);
 
 #ifdef CONFIG_CPU_FREQ_24_API
-	driver->cpu_min_freq[0] = speedstep_low_freq;
 	driver->cpu_cur_freq[0] = speed;
 #endif
 
@@ -703,7 +702,10 @@ static int __init speedstep_init(void)
 	driver->policy[0].cpu    = 0;
 	driver->policy[0].min    = speedstep_low_freq;
 	driver->policy[0].max    = speedstep_high_freq;
-	driver->policy[0].max_cpu_freq = speedstep_high_freq;
+	driver->policy[0].cpuinfo.min_freq = speedstep_low_freq;
+	driver->policy[0].cpuinfo.max_freq = speedstep_high_freq;
+	driver->policy[0].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+
 	driver->policy[0].policy = (speed == speedstep_low_freq) ? 
 	    CPUFREQ_POLICY_POWERSAVE : CPUFREQ_POLICY_PERFORMANCE;
 

arch/i386/kernel/cpu/mcheck/Makefile

 obj-y	=	mce.o k7.o p4.o p5.o p6.o winchip.o
 obj-$(CONFIG_X86_MCE_NONFATAL)	+=	non-fatal.o
-
-include $(TOPDIR)/Rules.make
-

arch/i386/kernel/cpu/mtrr/Makefile

@@ -4,5 +4,3 @@ obj-y		+= cyrix.o
 obj-y		+= centaur.o
 
 export-objs	:= main.o
-
-include $(TOPDIR)/Rules.make

arch/i386/kernel/suspend_asm.S

@@ -6,7 +6,7 @@
 #include <asm/segment.h>
 #include <asm/page.h>
 
-ENTRY(do_magic):
+ENTRY(do_magic)
 	pushl %ebx
 	cmpl $0,8(%esp)
 	jne .L1450
@@ -66,7 +66,7 @@ ENTRY(do_magic):
 .L1453:
 	movl $104,%eax
 
-	movw %eax, %ds
+	movw %ax, %ds
 	movl saved_context_esp, %esp
 	movl saved_context_ebp, %ebp
 	movl saved_context_eax, %eax

arch/i386/kernel/timers/Makefile

@@ -7,5 +7,3 @@ obj-y := timer.o
 obj-y += timer_tsc.o
 obj-y += timer_pit.o
 obj-$(CONFIG_X86_CYCLONE)   += timer_cyclone.o
-
-include $(TOPDIR)/Rules.make

arch/i386/lib/Makefile

@@ -11,5 +11,3 @@ obj-y = checksum.o delay.o \
 obj-$(CONFIG_X86_USE_3DNOW) += mmx.o
 obj-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
 obj-$(CONFIG_DEBUG_IOVIRT)  += iodebug.o
-
-include $(TOPDIR)/Rules.make

arch/i386/mach-generic/Makefile

@@ -5,5 +5,3 @@
 EXTRA_CFLAGS	+= -I../kernel
 
 obj-y				:= setup.o topology.o
-
-include $(TOPDIR)/Rules.make

arch/i386/mach-visws/Makefile

@@ -9,5 +9,3 @@ obj-y				:= setup.o traps.o
 obj-$(CONFIG_PCI)		+= pci-visws.o
 obj-$(CONFIG_X86_VISWS_APIC)	+= visws_apic.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= mpparse.o
-
-include $(TOPDIR)/Rules.make

arch/i386/mach-voyager/Makefile

@@ -13,5 +13,3 @@ export-objs	:=
 obj-y			:= setup.o voyager_basic.o voyager_thread.o
 
 obj-$(CONFIG_SMP)	+= voyager_smp.o voyager_cat.o
-
-include $(TOPDIR)/Rules.make

arch/i386/math-emu/Makefile

@@ -26,7 +26,5 @@ A_OBJS =reg_u_add.o reg_u_div.o reg_u_mul.o reg_u_sub.o \
 
 obj-y =$(C_OBJS) $(A_OBJS)
 
-include $(TOPDIR)/Rules.make
-
 proto:
 	cproto -e -DMAKING_PROTO *.c >fpu_proto.h

arch/i386/mm/Makefile

@@ -9,5 +9,3 @@ obj-y	:= init.o pgtable.o fault.o ioremap.o extable.o pageattr.o
 obj-$(CONFIG_DISCONTIGMEM)	+= discontig.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_HIGHMEM) += highmem.o
-
-include $(TOPDIR)/Rules.make

arch/i386/mm/fault.c

@@ -28,8 +28,6 @@
 
 extern void die(const char *,struct pt_regs *,long);
 
-extern int console_loglevel;
-
 #ifndef CONFIG_X86_WP_WORKS_OK
 /*
  * Ugly, ugly, but the goto's result in better assembly..

arch/i386/pci/Makefile

@@ -16,5 +16,3 @@ obj-y		+= legacy.o
 
 endif		# CONFIG_X86_NUMAQ
 obj-y		+= irq.o common.o
-
-include $(TOPDIR)/Rules.make

arch/i386/vmlinux.lds.S

@@ -67,6 +67,9 @@ SECTIONS
   __setup_start = .;
   .init.setup : { *(.init.setup) }
   __setup_end = .;
+  __start___param = .;
+  __param : { *(__param) }
+  __stop___param = .;
   __initcall_start = .;
   .initcall.init : {
 	*(.initcall1.init) 

arch/ia64/dig/Makefile

@@ -7,5 +7,3 @@
 
 obj-y := setup.o
 obj-$(CONFIG_IA64_GENERIC) += machvec.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/hp/common/Makefile

@@ -8,5 +8,3 @@
 export-objs := sba_iommu.o
 
 obj-y := sba_iommu.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/hp/sim/Makefile

@@ -13,5 +13,3 @@ obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o
 obj-$(CONFIG_HP_SIMETH)	+= simeth.o
 obj-$(CONFIG_HP_SIMSERIAL) += simserial.o
 obj-$(CONFIG_HP_SIMSCSI) += simscsi.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/hp/zx1/Makefile

@@ -7,5 +7,3 @@
 
 obj-y := hpzx1_misc.o
 obj-$(CONFIG_IA64_GENERIC) += hpzx1_machvec.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/ia32/Makefile

@@ -4,5 +4,3 @@
 
 obj-y := ia32_entry.o sys_ia32.o ia32_ioctl.o ia32_signal.o ia32_support.o ia32_traps.o \
 	 binfmt_elf32.o ia32_ldt.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/kernel/Makefile

@@ -15,5 +15,3 @@ obj-$(CONFIG_EFI_VARS) += efivars.o
 obj-$(CONFIG_SMP) += smp.o smpboot.o
 obj-$(CONFIG_IA64_MCA) += mca.o mca_asm.o
 obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/lib/Makefile

@@ -20,8 +20,6 @@ obj-$(CONFIG_PERFMON)	+= carta_random.o
 IGNORE_FLAGS_OBJS =	__divsi3.o __udivsi3.o __modsi3.o __umodsi3.o \
 			__divdi3.o __udivdi3.o __moddi3.o __umoddi3.o
 
-include $(TOPDIR)/Rules.make
-
 AFLAGS___divdi3.o	=
 AFLAGS___udivdi3.o	= -DUNSIGNED
 AFLAGS___moddi3.o	= 	     -DMODULO

arch/ia64/mm/Makefile

@@ -11,5 +11,3 @@ obj-y	 := init.o fault.o tlb.o extable.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_NUMA) += numa.o
 obj-$(CONFIG_DISCONTIGMEM) += discontig.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/pci/Makefile

 obj-y		:= pci.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/sn/fakeprom/Makefile

@@ -18,7 +18,3 @@ fprom: $(OBJ)
 
 clean:
 	rm -f *.o fprom
-
-
-include $(TOPDIR)/Rules.make
-

arch/ia64/sn/io/Makefile

@@ -37,5 +37,3 @@ obj-$(CONFIG_IA64_SGI_SN2)   += sn2/ml_SN_intr.o sn2/shub_intr.o sn2/shuberror.o
 				sn2/pcibr/pcibr_rrb.o sn2/pcibr/pcibr_slot.o 
 
 obj-$(CONFIG_PCIBA) += pciba.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/sn/kernel/Makefile

@@ -41,6 +41,3 @@ obj-$(CONFIG_IA64_SGI_SN2)      += irq.o mca.o sn2/
 obj-$(CONFIG_IA64_SGI_AUTOTEST) += llsc4.o misctest.o
 obj-$(CONFIG_IA64_GENERIC)      += machvec.o
 obj-$(CONFIG_MODULES)           += sn_ksyms.o
-
-
-include $(TOPDIR)/Rules.make

arch/ia64/sn/kernel/sn1/Makefile

@@ -35,5 +35,3 @@
 obj-y := cache.o error.o iomv.o synergy.o sn1_smp.o
 
 EXTRA_CFLAGS := -DLITTLE_ENDIAN
-
-include $(TOPDIR)/Rules.make

arch/ia64/sn/kernel/sn2/Makefile

@@ -35,6 +35,3 @@
 obj-y := cache.o iomv.o sn2_smp.o
 
 EXTRA_CFLAGS    := -DLITTLE_ENDIAN
-
-include $(TOPDIR)/Rules.make
-

arch/ia64/vmlinux.lds.S

@@ -102,6 +102,10 @@ SECTIONS
   .init.setup : AT(ADDR(.init.setup) - PAGE_OFFSET)
         { *(.init.setup) }
   __setup_end = .;
+  __start___param = .;
+  __param : AT(ADDR(__param) - PAGE_OFFSET)
+        { *(__param) }
+  __stop___param = .;
   __initcall_start = .;
   .initcall.init : AT(ADDR(.initcall.init) - PAGE_OFFSET)
 	{

arch/m68k/amiga/Makefile

@@ -7,5 +7,3 @@ export-objs	:= amiga_ksyms.o
 obj-y		:= config.o amiints.o cia.o chipram.o amisound.o amiga_ksyms.o
 
 obj-$(CONFIG_AMIGA_PCMCIA)	+= pcmcia.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/apollo/Makefile

@@ -3,5 +3,3 @@
 #
 
 obj-y		:= config.o dn_ints.o dma.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/atari/Makefile

@@ -10,5 +10,3 @@ obj-y		:= config.o time.o debug.o ataints.o stdma.o \
 ifeq ($(CONFIG_PCI),y)
 obj-$(CONFIG_HADES)	+= hades-pci.o
 endif
-
-include $(TOPDIR)/Rules.make

arch/m68k/bvme6000/Makefile

@@ -3,5 +3,3 @@
 #
 
 obj-y		:= config.o bvmeints.o rtc.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/fpsp040/Makefile

@@ -13,6 +13,4 @@ obj-y    := bindec.o binstr.o decbin.o do_func.o gen_except.o get_op.o \
 EXTRA_AFLAGS := -traditional
 EXTRA_LDFLAGS := -x
 
-include $(TOPDIR)/Rules.make
-
 $(OS_OBJS): fpsp.h

arch/m68k/hp300/Makefile

@@ -3,5 +3,3 @@
 #
 
 obj-y		:= ksyms.o config.o ints.o time.o reboot.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/ifpsp060/Makefile

@@ -8,5 +8,3 @@ obj-y := fskeleton.o iskeleton.o os.o
 
 EXTRA_AFLAGS := -traditional
 EXTRA_LDFLAGS := -x
-
-include $(TOPDIR)/Rules.make

arch/m68k/kernel/Makefile

@@ -17,8 +17,6 @@ obj-$(CONFIG_PCI)	+= bios32.o
 
 EXTRA_AFLAGS := -traditional
 
-include $(TOPDIR)/Rules.make
-
 $(obj)/head.o: $(obj)/head.S $(obj)/m68k_defs.h
 
 $(obj)/entry.o: $(obj)/entry.S $(obj)/m68k_defs.h

arch/m68k/lib/Makefile

@@ -8,5 +8,3 @@ EXTRA_AFLAGS := -traditional
 
 obj-y		:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
 			checksum.o memcmp.o memcpy.o memset.o semaphore.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/mac/Makefile

@@ -6,5 +6,3 @@ export-objs	:= mac_ksyms.o
 
 obj-y		:= config.o bootparse.o macints.o iop.o via.o oss.o psc.o \
 			baboon.o macboing.o debug.o misc.o mac_ksyms.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/math-emu/Makefile

@@ -9,5 +9,3 @@ EXTRA_AFLAGS := -traditional
 
 obj-y		:= fp_entry.o fp_scan.o fp_util.o fp_move.o fp_movem.o \
 			fp_cond.o fp_arith.o fp_log.o fp_trig.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/mm/Makefile

@@ -9,6 +9,3 @@ obj-y		+= kmap.o memory.o motorola.o
 else
 obj-y		+= sun3kmap.o sun3mmu.o
 endif
-
-
-include $(TOPDIR)/Rules.make

arch/m68k/mvme147/Makefile

@@ -3,6 +3,3 @@
 #
 
 obj-y		:= config.o 147ints.o
-
-include $(TOPDIR)/Rules.make
-

arch/m68k/mvme16x/Makefile

@@ -5,5 +5,3 @@
 export-objs	:= mvme16x_ksyms.o
 
 obj-y		:= config.o 16xints.o rtc.o mvme16x_ksyms.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/q40/Makefile

@@ -3,5 +3,3 @@
 #
 
 obj-y		:= config.o q40ints.o 
-
-include $(TOPDIR)/Rules.make

arch/m68k/sun3/Makefile

@@ -8,5 +8,3 @@ obj-y	:= sun3_ksyms.o sun3ints.o sun3dvma.o sbus.o idprom.o
 
 obj-$(CONFIG_SUN3) += config.o mmu_emu.o leds.o dvma.o \
 			intersil.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/sun3/prom/Makefile

@@ -5,5 +5,3 @@
 
 obj-y := init.o console.o printf.o  misc.o
 #bootstr.o init.o misc.o segment.o console.o printf.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/sun3x/Makefile

@@ -5,5 +5,3 @@
 export-objs	:= sun3x_ksyms.o
 
 obj-y		:= config.o time.o dvma.o prom.o
-
-include $(TOPDIR)/Rules.make

arch/m68knommu/Makefile

@@ -96,8 +96,6 @@ core-y	+= arch/m68knommu/kernel/ \
 	   arch/m68knommu/platform/$(PLATFORM)/
 libs-y	+= arch/m68knommu/lib/
 
-include $(TOPDIR)/Rules.make
-
 prepare: include/asm-$(ARCH)/asm-offsets.h
 
 archmrproper:

arch/m68knommu/kernel/Makefile

@@ -8,6 +8,3 @@ obj-y += init_task.o ints.o m68k_ksyms.o process.o ptrace.o semaphore.o \
 	 setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o
 
 obj-$(CONFIG_COMEMPCI)	+= comempci.o
-
-include $(TOPDIR)/Rules.make
-

arch/m68knommu/kernel/ints.c

@@ -33,7 +33,6 @@
  *	This table stores the address info for each vector handler.
  */
 irq_handler_t irq_list[SYS_IRQS];
-unsigned int *mach_kstat_irqs;
 
 #define NUM_IRQ_NODES 16
 static irq_node_t nodes[NUM_IRQ_NODES];
@@ -82,8 +81,6 @@ void __init init_IRQ(void)
 
 	if (mach_init_IRQ)
 		mach_init_IRQ();
-
-	mach_kstat_irqs = &kstat.irqs[0][0];
 }
 
 irq_node_t *new_irq_node(void)
@@ -233,7 +230,7 @@ asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
 {
 	if (vec >= VEC_INT1 && vec <= VEC_INT7) {
 		vec -= VEC_SPUR;
-		kstat.irqs[0][vec]++;
+		kstat_cpu(0).irqs[vec]++;
 		irq_list[vec].handler(vec, irq_list[vec].dev_id, fp);
 	} else {
 		if (mach_process_int)
@@ -254,7 +251,7 @@ int show_interrupts(struct seq_file *p, void *v)
 			continue;
 
 		seq_printf(p, "%3d: %10u ", i,
-			(i ? kstat.irqs[0][i] : num_spurious));
+			(i ? kstat_cpu(0).irqs[i] : num_spurious));
 		if (irq_list[i].flags & IRQ_FLG_LOCK)
 			seq_printf(p, "L ");
 		else