Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

be9c5ae4 · Linus Torvalds <[email protected]> · 2008-12-28 12:07:57 -08:00

* 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (246 commits)
  x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32
  x86: PAT: fix address types in track_pfn_vma_new()
  x86: prioritize the FPU traps for the error code
  x86: PAT: pfnmap documentation update changes
  x86: PAT: move track untrack pfnmap stubs to asm-generic
  x86: PAT: remove follow_pfnmap_pte in favor of follow_phys
  x86: PAT: modify follow_phys to return phys_addr prot and return value
  x86: PAT: clarify is_linear_pfn_mapping() interface
  x86: ia32_signal: remove unnecessary declaration
  x86: common.c boot_cpu_stack and boot_exception_stacks should be static
  x86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies
  x86: fix warning in arch/x86/kernel/microcode_amd.c
  x86: ia32.h: remove unused struct sigfram32 and rt_sigframe32
  x86: asm-offset_64: use rt_sigframe_ia32
  x86: sigframe.h: include headers for dependency
  x86: traps.c declare functions before they get used
  x86: PAT: update documentation to cover pgprot and remap_pfn related changes - v3
  x86: PAT: add pgprot_writecombine() interface for drivers - v3
  x86: PAT: change pgprot_noncached to uc_minus instead of strong uc - v3
  x86: PAT: implement track/untrack of pfnmap regions for x86 - v3
  ...

Commit: be9c5ae4eeec2e85527e95647348b8ea4eb25128
Parents: bb26c6c2 · 79a66b96

Merge commit. Changes below are compared with the first parent: bb26c6c2.

Changes

197 files changed · +5182 −4125

File	Status	Add	Del	Content
Documentation/feature-removal-schedule.txt	modified	+0	−12	View file
Documentation/filesystems/proc.txt	modified	+6	−3	View file
Documentation/kernel-parameters.txt	modified	+32	−1	View file
Documentation/nmi_watchdog.txt	modified	+5	−0	View file
Documentation/x86/boot.txt	modified	+3	−3	View file
Documentation/x86/pat.txt	modified	+24	−0	View file
Documentation/x86/x86_64/boot-options.txt	modified	+0	−11	View file
Documentation/x86/x86_64/mm.txt	modified	+1	−1	View file
arch/x86/Kconfig	modified	+56	−28	View file
arch/x86/Kconfig.debug	modified	+4	−16	View file
arch/x86/boot/video-vga.c	modified	+2	−2	View file
arch/x86/boot/video.c	modified	+1	−1	View file
arch/x86/configs/i386_defconfig	modified	+2	−2	View file
arch/x86/configs/x86_64_defconfig	modified	+2	−2	View file
arch/x86/ia32/ia32_signal.c	modified	+38	−71	View file
arch/x86/include/asm/apic.h	modified	+1	−0	View file
arch/x86/include/asm/bigsmp/apic.h	modified	+0	−2	View file
arch/x86/include/asm/bitops.h	modified	+9	−1	View file
arch/x86/include/asm/bug.h	modified	+1	−1	View file
arch/x86/include/asm/byteorder.h	modified	+29	−45	View file
arch/x86/include/asm/cpufeature.h	modified	+4	−1	View file
arch/x86/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/x86/include/asm/dwarf2.h	modified	+66	−31	View file
arch/x86/include/asm/emergency-restart.h	modified	+3	−1	View file
arch/x86/include/asm/es7000/apic.h	modified	+53	−26	View file
arch/x86/include/asm/es7000/wakecpu.h	modified	+10	−31	View file
arch/x86/include/asm/gart.h	modified	+33	−0	View file
arch/x86/include/asm/genapic_32.h	modified	+18	−1	View file
arch/x86/include/asm/genapic_64.h	modified	+2	−0	View file
arch/x86/include/asm/hardirq_32.h	modified	+2	−0	View file
arch/x86/include/asm/hardirq_64.h	modified	+2	−0	View file
arch/x86/include/asm/hw_irq.h	modified	+1	−3	View file
arch/x86/include/asm/hypervisor.h	added	+26	−0	View file
arch/x86/include/asm/ia32.h	modified	+0	−18	View file
arch/x86/include/asm/idle.h	modified	+5	−0	View file
arch/x86/include/asm/io.h	modified	+28	−9	View file
arch/x86/include/asm/io_64.h	modified	+0	−2	View file
arch/x86/include/asm/io_apic.h	modified	+10	−0	View file
arch/x86/include/asm/iommu.h	modified	+0	−33	View file
arch/x86/include/asm/irq.h	modified	+0	−4	View file
arch/x86/include/asm/irq_regs_32.h	modified	+2	−0	View file
arch/x86/include/asm/kexec.h	modified	+16	−15	View file
arch/x86/include/asm/linkage.h	modified	+60	−0	View file
arch/x86/include/asm/mach-default/mach_apic.h	modified	+2	−0	View file
arch/x86/include/asm/mach-default/mach_wakecpu.h	modified	+9	−15	View file
arch/x86/include/asm/mach-default/smpboot_hooks.h	modified	+5	−3	View file
arch/x86/include/asm/mach-generic/mach_apic.h	modified	+1	−0	View file
arch/x86/include/asm/mach-generic/mach_wakecpu.h	added	+12	−0	View file
arch/x86/include/asm/mmu_context_32.h	modified	+6	−7	View file
arch/x86/include/asm/msr-index.h	modified	+2	−0	View file
arch/x86/include/asm/msr.h	modified	+6	−6	View file
arch/x86/include/asm/numaq/wakecpu.h	modified	+13	−11	View file
arch/x86/include/asm/pci.h	modified	+2	−0	View file
arch/x86/include/asm/pgtable-2level.h	modified	+41	−9	View file
arch/x86/include/asm/pgtable-3level.h	modified	+1	−0	View file
arch/x86/include/asm/pgtable.h	modified	+22	−6	View file
arch/x86/include/asm/pgtable_32.h	modified	+0	−9	View file
arch/x86/include/asm/pgtable_64.h	modified	+17	−11	View file
arch/x86/include/asm/prctl.h	modified	+3	−0	View file
arch/x86/include/asm/processor.h	modified	+4	−0	View file
arch/x86/include/asm/reboot.h	modified	+5	−0	View file
arch/x86/include/asm/setup.h	modified	+7	−0	View file
arch/x86/include/asm/sigframe.h	added	+70	−0	View file
arch/x86/include/asm/signal.h	modified	+4	−2	View file
arch/x86/include/asm/sparsemem.h	modified	+1	−1	View file
arch/x86/include/asm/syscalls.h	modified	+8	−8	View file
arch/x86/include/asm/system.h	modified	+4	−2	View file
arch/x86/include/asm/thread_info.h	modified	+1	−1	View file
arch/x86/include/asm/trampoline.h	modified	+7	−0	View file
arch/x86/include/asm/traps.h	modified	+9	−2	View file
arch/x86/include/asm/tsc.h	modified	+1	−7	View file
arch/x86/include/asm/uaccess.h	modified	+2	−2	View file
arch/x86/include/asm/uv/bios.h	modified	+30	−4	View file
arch/x86/include/asm/uv/uv_hub.h	modified	+76	−27	View file
arch/x86/include/asm/vmware.h	added	+27	−0	View file
arch/x86/include/asm/xen/hypercall.h	modified	+6	−0	View file
arch/x86/include/asm/xen/hypervisor.h	modified	+8	−31	View file
arch/x86/include/asm/xen/page.h	modified	+5	−0	View file
arch/x86/kernel/Makefile	modified	+5	−2	View file
arch/x86/kernel/acpi/boot.c	modified	+11	−0	View file
arch/x86/kernel/amd_iommu.c	modified	+1	−0	View file
arch/x86/kernel/amd_iommu_init.c	modified	+1	−0	View file
arch/x86/kernel/aperture_64.c	modified	+3	−2	View file
arch/x86/kernel/apic.c	modified	+57	−83	View file
arch/x86/kernel/apm_32.c	modified	+0	−4	View file
arch/x86/kernel/asm-offsets_32.c	modified	+1	−1	View file
arch/x86/kernel/asm-offsets_64.c	modified	+3	−1	View file
arch/x86/kernel/bios_uv.c	modified	+54	−4	View file
arch/x86/kernel/check.c	added	+161	−0	View file
arch/x86/kernel/cpu/Makefile	modified	+1	−0	View file
arch/x86/kernel/cpu/addon_cpuid_features.c	modified	+8	−0	View file
arch/x86/kernel/cpu/amd.c	modified	+7	−2	View file
arch/x86/kernel/cpu/common.c	modified	+5	−3	View file
arch/x86/kernel/cpu/hypervisor.c	added	+58	−0	View file
arch/x86/kernel/cpu/intel.c	modified	+18	−3	View file
arch/x86/kernel/cpu/intel_cacheinfo.c	modified	+7	−10	View file
arch/x86/kernel/cpu/mcheck/mce_amd_64.c	modified	+1	−1	View file
arch/x86/kernel/cpu/mcheck/mce_intel_64.c	modified	+1	−1	View file
arch/x86/kernel/cpu/mtrr/main.c	modified	+171	−175	View file
arch/x86/kernel/cpu/vmware.c	added	+112	−0	View file
arch/x86/kernel/crash.c	modified	+8	−62	View file
arch/x86/kernel/ds.c	modified	+4	−5	View file
arch/x86/kernel/dumpstack.c	added	+319	−0	View file
arch/x86/kernel/dumpstack.h	added	+39	−0	View file
arch/x86/kernel/dumpstack_32.c	modified	+2	−300	View file
arch/x86/kernel/dumpstack_64.c	modified	+2	−280	View file
arch/x86/kernel/e820.c	modified	+0	−16	View file
arch/x86/kernel/early-quirks.c	modified	+1	−0	View file
arch/x86/kernel/early_printk.c	modified	+0	−47	View file
arch/x86/kernel/entry_32.S	modified	+249	−228	View file
arch/x86/kernel/entry_64.S	modified	+725	−635	View file
arch/x86/kernel/es7000_32.c	modified	+42	−20	View file
arch/x86/kernel/genapic_64.c	modified	+4	−0	View file
arch/x86/kernel/genx2apic_uv_x.c	modified	+107	−4	View file
arch/x86/kernel/head.c	modified	+0	−1	View file
arch/x86/kernel/head32.c	modified	+3	−0	View file
arch/x86/kernel/head64.c	modified	+3	−0	View file
arch/x86/kernel/hpet.c	modified	+3	−1	View file
arch/x86/kernel/init_task.c	modified	+0	−1	View file
arch/x86/kernel/io_apic.c	modified	+1	−2	View file
arch/x86/kernel/irq_64.c	modified	+10	−14	View file
arch/x86/kernel/irqinit_32.c	modified	+1	−1	View file
arch/x86/kernel/irqinit_64.c	modified	+0	−66	View file
arch/x86/kernel/machine_kexec_32.c	modified	+82	−22	View file
arch/x86/kernel/microcode_amd.c	modified	+86	−146	View file
arch/x86/kernel/microcode_core.c	modified	+3	−3	View file
arch/x86/kernel/microcode_intel.c	modified	+1	−1	View file
arch/x86/kernel/mpparse.c	modified	+11	−14	View file
arch/x86/kernel/nmi.c	modified	+46	−12	View file
arch/x86/kernel/numaq_32.c	modified	+9	−1	View file
arch/x86/kernel/pci-dma.c	modified	+3	−8	View file
arch/x86/kernel/process.c	modified	+18	−1	View file
arch/x86/kernel/ptrace.c	modified	+4	−5	View file
arch/x86/kernel/reboot.c	modified	+123	−3	View file
arch/x86/kernel/relocate_kernel_32.S	modified	+0	−115	View file
arch/x86/kernel/setup.c	modified	+21	−148	View file
arch/x86/kernel/sigframe.h	deleted	+0	−42	View before deletion
arch/x86/kernel/signal_32.c → arch/x86/kernel/signal.c	renamed	+380	−187	View file
arch/x86/kernel/signal_64.c	deleted	+0	−516	View before deletion
arch/x86/kernel/smp.c	modified	+3	−28	View file
arch/x86/kernel/smpboot.c	modified	+11	−12	View file
arch/x86/kernel/time_32.c	modified	+1	−1	View file
arch/x86/kernel/time_64.c	modified	+4	−2	View file
arch/x86/kernel/tlb_32.c	modified	+6	−7	View file
arch/x86/kernel/tlb_64.c	modified	+1	−1	View file
arch/x86/kernel/tlb_uv.c	modified	+0	−4	View file
arch/x86/kernel/trampoline.c	modified	+17	−2	View file
arch/x86/kernel/traps.c	modified	+15	−23	View file
arch/x86/kernel/tsc.c	modified	+29	−13	View file
arch/x86/kernel/tsc_sync.c	modified	+7	−1	View file
arch/x86/kernel/vmi_32.c	modified	+0	−119	View file
arch/x86/kernel/vsyscall_64.c	modified	+9	−0	View file
arch/x86/lguest/boot.c	modified	+2	−1	View file
arch/x86/mach-generic/bigsmp.c	modified	+1	−0	View file
arch/x86/mach-generic/default.c	modified	+1	−0	View file
arch/x86/mach-generic/es7000.c	modified	+13	−1	View file
arch/x86/mach-generic/probe.c	modified	+15	−1	View file
arch/x86/mach-generic/summit.c	modified	+1	−0	View file
arch/x86/mm/fault.c	modified	+7	−4	View file
arch/x86/mm/init_32.c	modified	+21	−11	View file
arch/x86/mm/init_64.c	modified	+0	−2	View file
arch/x86/mm/ioremap.c	modified	+2	−1	View file
arch/x86/mm/pat.c	modified	+236	−0	View file
arch/x86/pci/common.c	modified	+17	−0	View file
arch/x86/pci/direct.c	modified	+3	−1	View file
arch/x86/pci/pci.h	modified	+1	−0	View file
arch/x86/xen/enlighten.c	modified	+10	−7	View file
arch/x86/xen/mmu.c	modified	+10	−7	View file
arch/x86/xen/multicalls.c	modified	+1	−1	View file
arch/x86/xen/setup.c	modified	+5	−4	View file
drivers/acpi/pci_irq.c	modified	+56	−0	View file
drivers/acpi/processor_idle.c	modified	+3	−3	View file
drivers/firmware/dmi_scan.c	modified	+11	−0	View file
drivers/misc/sgi-gru/gruprocfs.c	modified	+0	−1	View file
drivers/misc/sgi-xp/xp.h	modified	+5	−2	View file
drivers/misc/sgi-xp/xp_main.c	modified	+7	−0	View file
drivers/misc/sgi-xp/xp_sn2.c	modified	+34	−0	View file
drivers/misc/sgi-xp/xp_uv.c	modified	+68	−2	View file
drivers/misc/sgi-xp/xpc.h	modified	+12	−0	View file
drivers/misc/sgi-xp/xpc_sn2.c	modified	+5	−10	View file
drivers/misc/sgi-xp/xpc_uv.c	modified	+234	−56	View file
drivers/pci/quirks.c	modified	+149	−21	View file
drivers/xen/balloon.c	modified	+3	−1	View file
drivers/xen/features.c	modified	+5	−1	View file
drivers/xen/grant-table.c	modified	+1	−0	View file
include/asm-generic/bug.h	modified	+8	−0	View file
include/asm-generic/pgtable.h	modified	+50	−0	View file
include/linux/dmi.h	modified	+2	−0	View file
include/linux/kexec.h	modified	+4	−0	View file
include/linux/linkage.h	modified	+0	−8	View file
include/linux/mm.h	modified	+19	−0	View file
include/linux/pci.h	modified	+6	−0	View file
include/linux/pci_ids.h	modified	+5	−0	View file
include/xen/interface/event_channel.h	modified	+2	−0	View file
lib/bug.c	modified	+17	−2	View file
mm/memory.c	modified	+48	−22	View file
mm/swapfile.c	modified	+9	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/feature-removal-schedule.txt

View file

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index c28a2ac..1a8af73 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -244,18 +244,6 @@ Who:	Michael Buesch <[email protected]>
 
 ---------------------------
 
-What:	init_mm export
-When:	2.6.26
-Why:	Not used in-tree. The current out-of-tree users used it to
-	work around problems in the CPA code which should be resolved
-	by now. One usecase was described to provide verification code
-	of the CPA operation. That's a good idea in general, but such
-	code / infrastructure should be in the kernel and not in some
-	out-of-tree driver.
-Who:	Thomas Gleixner <[email protected]>
-
-----------------------------
-
 What:	usedac i386 kernel parameter
 When:	2.6.27
 Why:	replaced by allowdac and no dac combination

Documentation/filesystems/proc.txt

View file

diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index bb1b0dd..71df353 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -1339,10 +1339,13 @@ nmi_watchdog
 
 Enables/Disables the NMI watchdog on x86 systems.  When the value is non-zero
 the NMI watchdog is enabled and will continuously test all online cpus to
-determine whether or not they are still functioning properly.
+determine whether or not they are still functioning properly. Currently,
+passing "nmi_watchdog=" parameter at boot time is required for this function
+to work.
 
-Because the NMI watchdog shares registers with oprofile, by disabling the NMI
-watchdog, oprofile may have more registers to utilize.
+If LAPIC NMI watchdog method is in use (nmi_watchdog=2 kernel parameter), the
+NMI watchdog shares registers with oprofile. By disabling the NMI watchdog,
+oprofile may have more registers to utilize.
 
 msgmni
 ------

Documentation/kernel-parameters.txt

View file

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index bffffa4..2c95cae 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1396,7 +1396,20 @@ and is between 256 and 4096 characters. It is defined in the file
 			when a NMI is triggered.
 			Format: [state][,regs][,debounce][,die]
 
-	nmi_watchdog=	[KNL,BUGS=X86-32] Debugging features for SMP kernels
+	nmi_watchdog=	[KNL,BUGS=X86-32,X86-64] Debugging features for SMP kernels
+			Format: [panic,][num]
+			Valid num: 0,1,2
+			0 - turn nmi_watchdog off
+			1 - use the IO-APIC timer for the NMI watchdog
+			2 - use the local APIC for the NMI watchdog using
+			a performance counter. Note: This will use one performance
+			counter and the local APIC's performance vector.
+			When panic is specified panic when an NMI watchdog timeout occurs.
+			This is useful when you use a panic=... timeout and need the box
+			quickly up again.
+			Instead of 1 and 2 it is possible to use the following
+			symbolic names: lapic and ioapic
+			Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic
 
 	no387		[BUGS=X86-32] Tells the kernel to use the 387 maths
 			emulation library even if a 387 maths coprocessor
@@ -1633,6 +1646,17 @@ and is between 256 and 4096 characters. It is defined in the file
 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
 				enabled, this kernel boot option can be used to
 				disable the use of MSI interrupts system-wide.
+		noioapicquirk	[APIC] Disable all boot interrupt quirks.
+				Safety option to keep boot IRQs enabled. This
+				should never be necessary.
+		ioapicreroute	[APIC] Enable rerouting of boot IRQs to the
+				primary IO-APIC for bridges that cannot disable
+				boot IRQs. This fixes a source of spurious IRQs
+				when the system masks IRQs.
+		noioapicreroute	[APIC] Disable workaround that uses the
+				boot IRQ equivalent of an IRQ that connects to
+				a chipset where boot IRQs cannot be disabled.
+				The opposite of ioapicreroute.
 		biosirq		[X86-32] Use PCI BIOS calls to get the interrupt
 				routing table. These calls are known to be buggy
 				on several machines and they hang the machine
@@ -2262,6 +2286,13 @@ and is between 256 and 4096 characters. It is defined in the file
 			Format:
 			<io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>
 
+	tsc=		Disable clocksource-must-verify flag for TSC.
+			Format: <string>
+			[x86] reliable: mark tsc clocksource as reliable, this
+			disables clocksource verification at runtime.
+			Used to enable high-resolution timer mode on older
+			hardware, and in virtualized environment.
+
 	turbografx.map[2|3]=	[HW,JOY]
 			TurboGraFX parallel port interface
 			Format:

Documentation/nmi_watchdog.txt

View file

diff --git a/Documentation/nmi_watchdog.txt b/Documentation/nmi_watchdog.txt
index 90aa453..bf9f80a 100644
--- a/Documentation/nmi_watchdog.txt
+++ b/Documentation/nmi_watchdog.txt
@@ -69,6 +69,11 @@ to the overall system performance.
 On x86 nmi_watchdog is disabled by default so you have to enable it with
 a boot time parameter.
 
+It's possible to disable the NMI watchdog in run-time by writing "0" to
+/proc/sys/kernel/nmi_watchdog. Writing "1" to the same file will re-enable
+the NMI watchdog. Notice that you still need to use "nmi_watchdog=" parameter
+at boot time.
+
 NOTE: In kernels prior to 2.4.2-ac18 the NMI-oopser is enabled unconditionally
 on x86 SMP boxes.
 

Documentation/x86/boot.txt

View file

diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 83c0033..fcdc62b 100644
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -349,7 +349,7 @@ Protocol:	2.00+
 	3  SYSLINUX
 	4  EtherBoot
 	5  ELILO
-	7  GRuB
+	7  GRUB
 	8  U-BOOT
 	9  Xen
 	A  Gujin
@@ -537,8 +537,8 @@ Type:		read
 Offset/size:	0x248/4
 Protocol:	2.08+
 
-  If non-zero then this field contains the offset from the end of the
-  real-mode code to the payload.
+  If non-zero then this field contains the offset from the beginning
+  of the protected-mode code to the payload.
 
   The payload may be compressed. The format of both the compressed and
   uncompressed data should be determined using the standard magic

Documentation/x86/pat.txt

View file

diff --git a/Documentation/x86/pat.txt b/Documentation/x86/pat.txt
index c93ff5f..cf08c9f 100644
--- a/Documentation/x86/pat.txt
+++ b/Documentation/x86/pat.txt
@@ -80,6 +80,30 @@ pci proc               |    --    |    --      |       WC         |
                        |          |            |                  |
 -------------------------------------------------------------------
 
+Advanced APIs for drivers
+-------------------------
+A. Exporting pages to users with remap_pfn_range, io_remap_pfn_range,
+vm_insert_pfn
+
+Drivers wanting to export some pages to userspace do it by using mmap
+interface and a combination of
+1) pgprot_noncached()
+2) io_remap_pfn_range() or remap_pfn_range() or vm_insert_pfn()
+
+With PAT support, a new API pgprot_writecombine is being added. So, drivers can
+continue to use the above sequence, with either pgprot_noncached() or
+pgprot_writecombine() in step 1, followed by step 2.
+
+In addition, step 2 internally tracks the region as UC or WC in memtype
+list in order to ensure no conflicting mapping.
+
+Note that this set of APIs only works with IO (non RAM) regions. If driver
+wants to export a RAM region, it has to do set_memory_uc() or set_memory_wc()
+as step 0 above and also track the usage of those pages and use set_memory_wb()
+before the page is freed to free pool.
+
+
+
 Notes:
 
 -- in the above table mean "Not suggested usage for the API". Some of the --'s

Documentation/x86/x86_64/boot-options.txt

View file

diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
index f6d561a..34c1304 100644
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
@@ -79,17 +79,6 @@ Timing
   Report when timer interrupts are lost because some code turned off
   interrupts for too long.
 
-  nmi_watchdog=NUMBER[,panic]
-  NUMBER can be:
-  0 don't use an NMI watchdog
-  1 use the IO-APIC timer for the NMI watchdog
-  2 use the local APIC for the NMI watchdog using a performance counter. Note
-  This will use one performance counter and the local APIC's performance
-  vector.
-  When panic is specified panic when an NMI watchdog timeout occurs.
-  This is useful when you use a panic=... timeout and need the box
-  quickly up again.
-
   nohpet
   Don't use the HPET timer.
 

Documentation/x86/x86_64/mm.txt

View file

diff --git a/Documentation/x86/x86_64/mm.txt b/Documentation/x86/x86_64/mm.txt
index efce750..29b52b1 100644
--- a/Documentation/x86/x86_64/mm.txt
+++ b/Documentation/x86/x86_64/mm.txt
@@ -6,7 +6,7 @@ Virtual memory map with 4 level page tables:
 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm
 hole caused by [48:63] sign extension
 ffff800000000000 - ffff80ffffffffff (=40 bits) guard hole
-ffff810000000000 - ffffc0ffffffffff (=46 bits) direct mapping of all phys. memory
+ffff880000000000 - ffffc0ffffffffff (=57 TB) direct mapping of all phys. memory
 ffffc10000000000 - ffffc1ffffffffff (=40 bits) hole
 ffffc20000000000 - ffffe1ffffffffff (=45 bits) vmalloc/ioremap space
 ffffe20000000000 - ffffe2ffffffffff (=40 bits) virtual memory map (1TB)

arch/x86/Kconfig

View file

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ac22bb7..a2ae4c0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -19,6 +19,8 @@ config X86_64
 config X86
 	def_bool y
 	select HAVE_AOUT if X86_32
+	select HAVE_READQ
+	select HAVE_WRITEQ
 	select HAVE_UNSTABLE_SCHED_CLOCK
 	select HAVE_IDE
 	select HAVE_OPROFILE
@@ -87,6 +89,10 @@ config GENERIC_IOMAP
 config GENERIC_BUG
 	def_bool y
 	depends on BUG
+	select GENERIC_BUG_RELATIVE_POINTERS if X86_64
+
+config GENERIC_BUG_RELATIVE_POINTERS
+	bool
 
 config GENERIC_HWEIGHT
 	def_bool y
@@ -242,21 +248,13 @@ config X86_FIND_SMP_CONFIG
 	def_bool y
 	depends on X86_MPPARSE || X86_VOYAGER
 
-if ACPI
 config X86_MPPARSE
-	def_bool y
-	bool "Enable MPS table"
+	bool "Enable MPS table" if ACPI
+	default y
 	depends on X86_LOCAL_APIC
 	help
 	  For old smp systems that do not have proper acpi support. Newer systems
 	  (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
-endif
-
-if !ACPI
-config X86_MPPARSE
-	def_bool y
-	depends on X86_LOCAL_APIC
-endif
 
 choice
 	prompt "Subarchitecture Type"
@@ -465,10 +463,6 @@ config X86_CYCLONE_TIMER
 	def_bool y
 	depends on X86_GENERICARCH
 
-config ES7000_CLUSTERED_APIC
-	def_bool y
-	depends on SMP && X86_ES7000 && MPENTIUMIII
-
 source "arch/x86/Kconfig.cpu"
 
 config HPET_TIMER
@@ -569,7 +563,7 @@ config AMD_IOMMU
 
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB
-	bool
+	def_bool y if X86_64
 	help
 	  Support for software bounce buffers used on x86-64 systems
 	  which don't have a hardware IOMMU (e.g. the current generation
@@ -660,6 +654,30 @@ config X86_VISWS_APIC
 	def_bool y
 	depends on X86_32 && X86_VISWS
 
+config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
+	bool "Reroute for broken boot IRQs"
+	default n
+	depends on X86_IO_APIC
+	help
+	  This option enables a workaround that fixes a source of
+	  spurious interrupts. This is recommended when threaded
+	  interrupt handling is used on systems where the generation of
+	  superfluous "boot interrupts" cannot be disabled.
+
+	  Some chipsets generate a legacy INTx "boot IRQ" when the IRQ
+	  entry in the chipset's IO-APIC is masked (as, e.g. the RT
+	  kernel does during interrupt handling). On chipsets where this
+	  boot IRQ generation cannot be disabled, this workaround keeps
+	  the original IRQ line masked so that only the equivalent "boot
+	  IRQ" is delivered to the CPUs. The workaround also tells the
+	  kernel to set up the IRQ handler on the boot IRQ line. In this
+	  way only one interrupt is delivered to the kernel. Otherwise
+	  the spurious second interrupt may cause the kernel to bring
+	  down (vital) interrupt lines.
+
+	  Only affects "broken" chipsets. Interrupt sharing may be
+	  increased on these systems.
+
 config X86_MCE
 	bool "Machine Check Exception"
 	depends on !X86_VOYAGER
@@ -956,24 +974,37 @@ config X86_PAE
 config ARCH_PHYS_ADDR_T_64BIT
        def_bool X86_64 || X86_PAE
 
+config DIRECT_GBPAGES
+	bool "Enable 1GB pages for kernel pagetables" if EMBEDDED
+	default y
+	depends on X86_64
+	help
+	  Allow the kernel linear mapping to use 1GB pages on CPUs that
+	  support it. This can improve the kernel's performance a tiny bit by
+	  reducing TLB pressure. If in doubt, say "Y".
+
 # Common NUMA Features
 config NUMA
-	bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
+	bool "Numa Memory Allocation and Scheduler Support"
 	depends on SMP
 	depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL)
 	default n if X86_PC
 	default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
 	help
 	  Enable NUMA (Non Uniform Memory Access) support.
+
 	  The kernel will try to allocate memory used by a CPU on the
 	  local memory controller of the CPU and add some more
 	  NUMA awareness to the kernel.
 
-	  For 32-bit this is currently highly experimental and should be only
-	  used for kernel development. It might also cause boot failures.
-	  For 64-bit this is recommended on all multiprocessor Opteron systems.
-	  If the system is EM64T, you should say N unless your system is
-	  EM64T NUMA.
+	  For 64-bit this is recommended if the system is Intel Core i7
+	  (or later), AMD Opteron, or EM64T NUMA.
+
+	  For 32-bit this is only needed on (rare) 32-bit-only platforms
+	  that support NUMA topologies, such as NUMAQ / Summit, or if you
+	  boot a 32-bit kernel on a 64-bit NUMA platform.
+
+	  Otherwise, you should say N.
 
 comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
 	depends on X86_32 && X86_SUMMIT && (!HIGHMEM64G || !ACPI)
@@ -1493,6 +1524,10 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
 	def_bool y
 	depends on X86_64 || (X86_32 && HIGHMEM)
 
+config ARCH_ENABLE_MEMORY_HOTREMOVE
+	def_bool y
+	depends on MEMORY_HOTPLUG
+
 config HAVE_ARCH_EARLY_PFN_TO_NID
 	def_bool X86_64
 	depends on NUMA
@@ -1632,13 +1667,6 @@ config APM_ALLOW_INTS
 	  many of the newer IBM Thinkpads.  If you experience hangs when you
 	  suspend, try setting this to Y.  Otherwise, say N.
 
-config APM_REAL_MODE_POWER_OFF
-	bool "Use real mode APM BIOS call to power off"
-	help
-	  Use real mode APM BIOS calls to switch off the computer. This is
-	  a work-around for a number of buggy BIOSes. Switch this option on if
-	  your computer crashes instead of powering off properly.
-
 endif # APM
 
 source "arch/x86/kernel/cpu/cpufreq/Kconfig"

arch/x86/Kconfig.debug

View file

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 2a3dfbd..4ee7686 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -114,18 +114,6 @@ config DEBUG_RODATA
 	  data. This is recommended so that we can catch kernel bugs sooner.
 	  If in doubt, say "Y".
 
-config DIRECT_GBPAGES
-	bool "Enable gbpages-mapped kernel pagetables"
-	depends on DEBUG_KERNEL && EXPERIMENTAL && X86_64
-	help
-	  Enable gigabyte pages support (if the CPU supports it). This can
-	  improve the kernel's performance a tiny bit by reducing TLB
-	  pressure.
-
-	  This is experimental code.
-
-	  If in doubt, say "N".
-
 config DEBUG_RODATA_TEST
 	bool "Testcase for the DEBUG_RODATA feature"
 	depends on DEBUG_RODATA
@@ -307,10 +295,10 @@ config OPTIMIZE_INLINING
 	  developers have marked 'inline'. Doing so takes away freedom from gcc to
 	  do what it thinks is best, which is desirable for the gcc 3.x series of
 	  compilers. The gcc 4.x series have a rewritten inlining algorithm and
-	  disabling this option will generate a smaller kernel there. Hopefully
-	  this algorithm is so good that allowing gcc4 to make the decision can
-	  become the default in the future, until then this option is there to
-	  test gcc for this.
+	  enabling this option will generate a smaller kernel there. Hopefully
+	  this algorithm is so good that allowing gcc 4.x and above to make the
+	  decision will become the default in the future. Until then this option
+	  is there to test gcc for this.
 
 	  If unsure, say N.
 

arch/x86/boot/video-vga.c

View file

diff --git a/arch/x86/boot/video-vga.c b/arch/x86/boot/video-vga.c
index b939cb4..5d4742e 100644
--- a/arch/x86/boot/video-vga.c
+++ b/arch/x86/boot/video-vga.c
@@ -34,7 +34,7 @@ static struct mode_info cga_modes[] = {
 	{ VIDEO_80x25,  80, 25, 0 },
 };
 
-__videocard video_vga;
+static __videocard video_vga;
 
 /* Set basic 80x25 mode */
 static u8 vga_set_basic_mode(void)
@@ -259,7 +259,7 @@ static int vga_probe(void)
 	return mode_count[adapter];
 }
 
-__videocard video_vga = {
+static __videocard video_vga = {
 	.card_name	= "VGA",
 	.probe		= vga_probe,
 	.set_mode	= vga_set_mode,

arch/x86/boot/video.c

View file

diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
index 83598b2..3bef2c1 100644
--- a/arch/x86/boot/video.c
+++ b/arch/x86/boot/video.c
@@ -226,7 +226,7 @@ static unsigned int mode_menu(void)
 
 #ifdef CONFIG_VIDEO_RETAIN
 /* Save screen content to the heap */
-struct saved_screen {
+static struct saved_screen {
 	int x, y;
 	int curx, cury;
 	u16 *data;

arch/x86/configs/i386_defconfig

View file

diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index 13b8c86..b30a08e 100644
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@ -77,7 +77,7 @@ CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_TREE=y
 # CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_BUF_SHIFT=18
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_NS=y
@@ -298,7 +298,7 @@ CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 # CONFIG_KEXEC_JUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
+# CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x200000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set

arch/x86/configs/x86_64_defconfig

View file

diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index f0a03d7..0e7dbc0 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -77,7 +77,7 @@ CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_TREE=y
 # CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_BUF_SHIFT=18
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_NS=y
@@ -298,7 +298,7 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
+# CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x200000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set

arch/x86/ia32/ia32_signal.c

View file

diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 4bc02b2..b195f85 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -32,6 +32,8 @@
 #include <asm/proto.h>
 #include <asm/vdso.h>
 
+#include <asm/sigframe.h>
+
 #define DEBUG_SIG 0
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
@@ -41,7 +43,6 @@
 			 X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \
 			 X86_EFLAGS_CF)
 
-asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset);
 void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
 
 int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
@@ -173,47 +174,28 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
 /*
  * Do a signal return; undo the signal stack.
  */
+#define COPY(x)			{		\
+	err |= __get_user(regs->x, &sc->x);	\
+}
 
-struct sigframe
-{
-	u32 pretcode;
-	int sig;
-	struct sigcontext_ia32 sc;
-	struct _fpstate_ia32 fpstate_unused; /* look at kernel/sigframe.h */
-	unsigned int extramask[_COMPAT_NSIG_WORDS-1];
-	char retcode[8];
-	/* fp state follows here */
-};
-
-struct rt_sigframe
-{
-	u32 pretcode;
-	int sig;
-	u32 pinfo;
-	u32 puc;
-	compat_siginfo_t info;
-	struct ucontext_ia32 uc;
-	char retcode[8];
-	/* fp state follows here */
-};
-
-#define COPY(x)		{ 		\
-	unsigned int reg;		\
-	err |= __get_user(reg, &sc->x);	\
-	regs->x = reg;			\
+#define COPY_SEG_CPL3(seg)	{			\
+		unsigned short tmp;			\
+		err |= __get_user(tmp, &sc->seg);	\
+		regs->seg = tmp | 3;			\
 }
 
-#define RELOAD_SEG(seg,mask)						\
-	{ unsigned int cur;						\
-	  unsigned short pre;						\
-	  err |= __get_user(pre, &sc->seg);				\
-	  savesegment(seg, cur);					\
-	  pre |= mask;							\
-	  if (pre != cur) loadsegment(seg, pre); }
+#define RELOAD_SEG(seg)		{		\
+	unsigned int cur, pre;			\
+	err |= __get_user(pre, &sc->seg);	\
+	savesegment(seg, cur);			\
+	pre |= 3;				\
+	if (pre != cur)				\
+		loadsegment(seg, pre);		\
+}
 
 static int ia32_restore_sigcontext(struct pt_regs *regs,
 				   struct sigcontext_ia32 __user *sc,
-				   unsigned int *peax)
+				   unsigned int *pax)
 {
 	unsigned int tmpflags, gs, oldgs, err = 0;
 	void __user *buf;
@@ -240,18 +222,16 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,
 	if (gs != oldgs)
 		load_gs_index(gs);
 
-	RELOAD_SEG(fs, 3);
-	RELOAD_SEG(ds, 3);
-	RELOAD_SEG(es, 3);
+	RELOAD_SEG(fs);
+	RELOAD_SEG(ds);
+	RELOAD_SEG(es);
 
 	COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);
 	COPY(dx); COPY(cx); COPY(ip);
 	/* Don't touch extended registers */
 
-	err |= __get_user(regs->cs, &sc->cs);
-	regs->cs |= 3;
-	err |= __get_user(regs->ss, &sc->ss);