Skip to contentSkip to conversation

x86 updates for v2.6.30, stage 1

GIT PULL Ingo Molnar 1 participant 1 message Mar 26, 2009

Subsystems (14)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-stage-1-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-stage-1-for-linus

These are nine non-dependent topics of the x86 tree, they carry 53 commits out of a total of 900 (non-merge) x86 commits queued up for this cycle.

out-of-topic modifications in x86-stage-1-for-linus:
----------------------------------------------------
arch/ia64/kernel/acpi.c # 970ec1a: [IA64] fix __apci_unmap_table

                                   # 7d97277: acpi/x86: introduce __apci_map_ta
drivers/acpi/acpica/tbxface.c      # 7d97277: acpi/x86: introduce __apci_map_ta
drivers/acpi/osl.c                 # 0d3a9cf: acpi: add some missing section ma
                                   # 7d97277: acpi/x86: introduce __apci_map_ta
drivers/acpi/tables.c              # 7d97277: acpi/x86: introduce __apci_map_ta
drivers/pci/dmar.c                 # 8e1568f: pci, x86, acpi: fix early_ioremap
drivers/pci/intr_remapping.c       # 6d652ea: x86: smp.h move boot_cpu_id decla
drivers/watchdog/rdc321x_wdt.c     # 5662a2f: x86, rdc321x: remove/move leftove
include/acpi/acpiosxf.h            # 7d97277: acpi/x86: introduce __apci_map_ta
include/acpi/acpixf.h              # 7d97277: acpi/x86: introduce __apci_map_ta
include/linux/acpi.h               # 970ec1a: [IA64] fix __apci_unmap_table
                                   # 7d97277: acpi/x86: introduce __apci_map_ta
include/linux/mm.h                 # 895791d: VM, x86, PAT: add a new vm flag t
                                   # 4bb9c5c: VM, x86, PAT: Change is_linear_pf
mm/memory.c                        # 895791d: VM, x86, PAT: add a new vm flag t
                                   # 4bb9c5c: VM, x86, PAT: Change is_linear_pf

The ACPI bits are driven by an x86 change that changes ACPI table-mapping assumptions. They were thus developed and tested in the x86 tree and were seen and Ack-ed by Len.

The PAT related MM changes were seen and Ack-ed by Nick (after some fixing requested by Nick).

Highlights:

- These are mostly cleanups and fixes.

Risks:

- The PAT changes have been problematic historically. These fix problems introduced by previous PAT patches but they could also introduce new problems.

- There are no known regressions.

Thanks,

Ingo

------------------>
Andi Kleen (1):
x86, mce: enable machine checks in 64-bit defconfig

Baodong Chen (1):
Documentation/x86/boot.txt: modify fieldname

H. Peter Anvin (1):
x86, mce: enable machine checks in 32-bit defconfig

Hiroshi Shimamoto (7):
x86: uaccess: fix style problems
x86: uaccess: rename __put_user_u64() to __put_user_asm_u64()
x86: uaccess: introduce try and catch framework
x86: signal: use {get|put}_user_try and catch
x86: ia32_signal: use {get|put}_user_try and catch
x86: uaccess: fix compilation error on CONFIG_M386
x86: uaccess: use errret as error value in __put_user_size()

Huang Ying (1):
x86: kexec: Use one page table in x86_64 machine_kexec

Ingo Molnar (5):
x86, rdc321x: remove/move leftover files x86, defconfig: update the 32-bit defconfig x86, defconfig: update the 64-bit defconfig x86, defconfig: turn off CONFIG_ENABLE_WARN_DEPRECATED x86, defconfig: turn off CONFIG_SCSI_ISCSI_ATTRS=y

Jan Beulich (1):
x86: fix HYPERVISOR_update_descriptor()

Jaswinder Singh Rajput (19):
x86: smp.h remove obsolete function declaration
x86: smp.h move zap_low_mappings declartion to tlbflush.h
x86: smp.h move prefill_possible_map declartion to cpu.h
x86: smp.h move stack_processor_id declartion to cpu.h
x86: smp.h move safe_smp_processor_id declartion to cpu.h
x86: smp.h move cpu_physical_id declartion to cpu.h
x86: smp.h move boot_cpu_id declartion to cpu.h
x86: rename intel_mp_floating to mpf_intel
x86: rename all fields of mpf_intel mpf_X to X
x86: smp.h move cpu_callin_mask and cpu_callin_map declartion to cpumask.h
x86: smp.h move cpu_callout_mask and cpu_callout_map declartion to cpumask.h
x86: smp.h move cpu_initialized_mask and cpu_initialized declartion to cpumask.h
x86: smp.h move cpu_sibling_setup_mask and cpu_sibling_setup_map declartion to cpumask.h
x86: microcode_intel.c fix style problems
x86: msr.c fix style problems
x86: module_32.c fix style problems
x86: module_64.c fix style problems
x86: replacing mp_config_ioapic with mpc_ioapic
x86: replacing mp_config_intsrc with mpc_intsrc

Jeremy Fitzhardinge (5):
x86: use early_ioremap in __acpi_map_table
x86: always explicitly map acpi memory
acpi: remove final __acpi_map_table mapping before setting acpi_gbl_permanent_mmap
acpi: add some missing section markers
x86, paravirt: prevent gcc from generating the wrong addressing mode

Jiri Kosina (1):
x86: remove byte locks

Michael Ellerman (1):
x86: Remove never-called arch_setup_msi_irq()

Pallipadi, Venkatesh (2):
VM, x86, PAT: Change is_linear_pfn_mapping to not use vm_pgoff VM, x86, PAT: add a new vm flag to track full pfnmap at mmap

Stuart Bennett (1):
x86: mmiotrace: quieten spurious warning message

Yasuaki Ishimatsu (2):
x86: fix debug message of CPU clock speed
x86: unify PM-Timer messages

Yinghai Lu (6):
x86: make 32bit MAX_HARDIRQS_PER_CPU to be NR_VECTORS acpi/x86: introduce __apci_map_table, v4 x86, es7000: fix ACPI table mappings
pci, x86, acpi: fix early_ioremap() leak [IA64] fix __apci_unmap_table
x86/doc: mini-howto for using earlyprintk=dbgp

 Documentation/x86/boot.txt                         |   13 +-
 Documentation/x86/earlyprintk.txt                  |  101 +++++
 arch/ia64/kernel/acpi.c                            |    4 +
 arch/x86/configs/i386_defconfig                    |  417 +++++++++++++++----
 arch/x86/configs/x86_64_defconfig                  |  423 ++++++++++++++++----
 arch/x86/ia32/ia32_signal.c                        |  365 +++++++++--------
 arch/x86/include/asm/acpi.h                        |    3 -
 arch/x86/include/asm/cpu.h                         |   21 +
 arch/x86/include/asm/cpumask.h                     |   28 ++
 arch/x86/include/asm/fixmap_32.h                   |    4 -
 arch/x86/include/asm/fixmap_64.h                   |    4 -
 arch/x86/include/asm/hardirq_32.h                  |    3 +
 arch/x86/include/asm/io_apic.h                     |   26 +--
 arch/x86/include/asm/kexec.h                       |   27 +-
 arch/x86/include/asm/mach-rdc321x/gpio.h           |   60 ---
 arch/x86/include/asm/mpspec_def.h                  |   23 +-
 arch/x86/include/asm/paravirt.h                    |    6 +-
 .../include/asm/{mach-rdc321x => }/rdc321x_defs.h  |    0
 arch/x86/include/asm/smp.h                         |   41 +--
 arch/x86/include/asm/spinlock.h                    |   66 +---
 arch/x86/include/asm/thread_info.h                 |    1 +
 arch/x86/include/asm/tlbflush.h                    |    2 +
 arch/x86/include/asm/uaccess.h                     |  138 ++++++-
 arch/x86/include/asm/xen/hypercall.h               |    2 +
 arch/x86/kernel/acpi/boot.c                        |  127 +++----
 arch/x86/kernel/apic.c                             |   51 ++-
 arch/x86/kernel/cpu/common.c                       |    2 +
 arch/x86/kernel/crash.c                            |    2 +-
 arch/x86/kernel/es7000_32.c                        |    9 +-
 arch/x86/kernel/io_apic.c                          |  153 +++-----
 arch/x86/kernel/machine_kexec_64.c                 |   82 +++--
 arch/x86/kernel/microcode_intel.c                  |   10 +-
 arch/x86/kernel/module_32.c                        |    6 +-
 arch/x86/kernel/module_64.c                        |   32 +-
 arch/x86/kernel/mpparse.c                          |  142 ++++----
 arch/x86/kernel/msr.c                              |    2 +-
 arch/x86/kernel/paravirt-spinlocks.c               |   10 -
 arch/x86/kernel/reboot.c                           |    1 +
 arch/x86/kernel/relocate_kernel_64.S               |  125 +------
 arch/x86/kernel/setup.c                            |    2 +-
 arch/x86/kernel/setup_percpu.c                     |    1 +
 arch/x86/kernel/signal.c                           |  297 ++++++++-------
 arch/x86/kernel/smpboot.c                          |    1 -
 arch/x86/mach-rdc321x/Makefile                     |    5 -
 arch/x86/mach-rdc321x/gpio.c                       |  194 ---------
 arch/x86/mach-rdc321x/platform.c                   |   69 ----
 arch/x86/mach-voyager/setup.c                      |    1 +
 arch/x86/mm/extable.c                              |    6 +
 arch/x86/mm/init_32.c                              |    1 -
 arch/x86/mm/kmmio.c                                |    2 +-
 arch/x86/mm/pat.c                                  |    5 +-
 drivers/acpi/acpica/tbxface.c                      |   17 +-
 drivers/acpi/osl.c                                 |   13 +-
 drivers/acpi/tables.c                              |   20 +-
 drivers/pci/dmar.c                                 |    7 +-
 drivers/pci/intr_remapping.c                       |    1 +
 drivers/watchdog/rdc321x_wdt.c                     |    2 +-
 include/acpi/acpiosxf.h                            |    1 +
 include/acpi/acpixf.h                              |    4 +
 include/linux/acpi.h                               |    1 +
 include/linux/mm.h                                 |    3 +-
 mm/memory.c                                        |    6 +-
 62 files changed, 1728 insertions(+), 1463 deletions(-)
 create mode 100644 Documentation/x86/earlyprintk.txt
 create mode 100644 arch/x86/include/asm/cpumask.h
 delete mode 100644 arch/x86/include/asm/mach-rdc321x/gpio.h
 rename arch/x86/include/asm/{mach-rdc321x => }/rdc321x_defs.h (100%)
 delete mode 100644 arch/x86/mach-rdc321x/Makefile
 delete mode 100644 arch/x86/mach-rdc321x/gpio.c
 delete mode 100644 arch/x86/mach-rdc321x/platform.c
Documentation/x86/boot.txt +7 -6
index 7b4596a..1229969 100644
@@ -158,7 +158,7 @@ Offset	Proto	Name		Meaning
 0202/4	2.00+	header		Magic signature "HdrS"
 0206/2	2.00+	version		Boot protocol version supported
 0208/4	2.00+	realmode_swtch	Boot loader hook (see below)
-020C/2	2.00+	start_sys	The load-low segment (0x1000) (obsolete)
+020C/2	2.00+	start_sys_seg	The load-low segment (0x1000) (obsolete)
 020E/2	2.00+	kernel_version	Pointer to kernel version string
 0210/1	2.00+	type_of_loader	Boot loader identifier
 0211/1	2.00+	loadflags	Boot protocol option flags
@@ -170,10 +170,11 @@ Offset	Proto	Name		Meaning
 0224/2	2.01+	heap_end_ptr	Free memory after setup end
 0226/2	N/A	pad1		Unused
 0228/4	2.02+	cmd_line_ptr	32-bit pointer to the kernel command line
-022C/4	2.03+	initrd_addr_max	Highest legal initrd address
+022C/4	2.03+	ramdisk_max	Highest legal initrd address
 0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel
 0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not
-0235/3	N/A	pad2		Unused
+0235/1	N/A	pad2		Unused
+0236/2	N/A	pad3		Unused
 0238/4	2.06+	cmdline_size	Maximum size of the kernel command line
 023C/4	2.07+	hardware_subarch Hardware subarchitecture
 0240/8	2.07+	hardware_subarch_data Subarchitecture-specific data
@@ -299,14 +300,14 @@ Protocol:	2.00+
   e.g. 0x0204 for version 2.04, and 0x0a11 for a hypothetical version
   10.17.
 
-Field name:	readmode_swtch
+Field name:	realmode_swtch
 Type:		modify (optional)
 Offset/size:	0x208/4
 Protocol:	2.00+
 
   Boot loader hook (see ADVANCED BOOT LOADER HOOKS below.)
 
-Field name:	start_sys
+Field name:	start_sys_seg
 Type:		read
 Offset/size:	0x20c/2
 Protocol:	2.00+
@@ -468,7 +469,7 @@ Protocol:	2.02+
   zero, the kernel will assume that your boot loader does not support
   the 2.02+ protocol.
 
-Field name:	initrd_addr_max
+Field name:	ramdisk_max
 Type:		read
 Offset/size:	0x22c/4
 Protocol:	2.03+
Documentation/x86/earlyprintk.txt new file +101 -0

101 lines not on this page · raw message

arch/ia64/kernel/acpi.c +4 -0
index d541671..bdef2ce 100644
@@ -199,6 +199,10 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
 	return __va(phys_addr);
 }
 
+void __init __acpi_unmap_table(char *map, unsigned long size)
+{
+}
+
 /* --------------------------------------------------------------------------
                             Boot-time Table Parsing
    -------------------------------------------------------------------------- */
arch/x86/configs/i386_defconfig +330 -87

1,179 lines not on this page · raw message

arch/x86/configs/x86_64_defconfig +338 -85

1,213 lines not on this page · raw message

arch/x86/ia32/ia32_signal.c +195 -170

447 lines not on this page · raw message

arch/x86/include/asm/acpi.h +0 -3
index 9830681..4518dc5 100644
@@ -102,9 +102,6 @@ static inline void disable_acpi(void)
 	acpi_noirq = 1;
 }
 
-/* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
-#define FIX_ACPI_PAGES 4
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/cpu.h +21 -0
index bae482d..f03b23e 100644

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/cpumask.h new file +28 -0
new file mode 100644
index 0000000..26c6dad

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/fixmap_32.h +0 -4
index c7115c1..047d9ba 100644

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/fixmap_64.h +0 -4
index 8be7409..3b55d39 100644

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/hardirq_32.h +3 -0
index cf7954d..d4b5d73 100644

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/io_apic.h +2 -24
index 7a1f44a..08ec793 100644

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/kexec.h +9 -18
index c61d8b2..0ceb6d1 100644

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/mach-rdc321x/gpio.h deleted +0 -60

60 lines not on this page · raw message

arch/x86/include/asm/mpspec_def.h +12 -11
index 59568bc..4a7f96d 100644

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/paravirt.h +2 -4
index e299287..32a7109 100644

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/rdc321x_defs.h renamed from arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h +0 -0
similarity index 100%
rename from arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h
rename to arch/x86/include/asm/rdc321x_defs.h
arch/x86/include/asm/smp.h +1 -40

41 lines not on this page · raw message

arch/x86/include/asm/spinlock.h +2 -64

66 lines not on this page · raw message

arch/x86/include/asm/thread_info.h +1 -0
index 9878964..3f90aeb 100644

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/tlbflush.h +2 -0
index 0e7bbb5..aed0b70 100644

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/uaccess.h +130 -8

138 lines not on this page · raw message

arch/x86/include/asm/xen/hypercall.h +2 -0
index 5e79ca6..9c371e4 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/acpi/boot.c +54 -73

127 lines not on this page · raw message

arch/x86/kernel/apic.c +32 -19

51 lines not on this page · raw message

arch/x86/kernel/cpu/common.c +2 -0
index 83492b1..f002584 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/crash.c +1 -1
index c689d19..11b93ca 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/es7000_32.c +8 -1
index 53699c9..71d7be6 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/io_apic.c +59 -94

153 lines not on this page · raw message

arch/x86/kernel/machine_kexec_64.c +55 -27

82 lines not on this page · raw message

arch/x86/kernel/microcode_intel.c +5 -5
index b7f4c92..5e9f4fc 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/module_32.c +3 -3
index 3db0a54..0edd819 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/module_64.c +16 -16
index 6ba8783..c23880b 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/mpparse.c +71 -71

142 lines not on this page · raw message

arch/x86/kernel/msr.c +1 -1
index 7262666..3cf3413 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/paravirt-spinlocks.c +0 -10
index 95777b0..3a7c5a4 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/reboot.c +1 -0
index 4526b3a..5de3693 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/relocate_kernel_64.S +3 -122

125 lines not on this page · raw message

arch/x86/kernel/setup.c +1 -1
index 6a8811a..f872205 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/setup_percpu.c +1 -0
index 0116107..e4c32e1 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/signal.c +154 -137

291 lines not on this page · raw message

arch/x86/kernel/smpboot.c +0 -1
index bb1a3b1..6c2b844 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-rdc321x/Makefile deleted +0 -5
deleted file mode 100644
index 8325b4c..0000000

Lines of this file are not shown. View the raw message.

arch/x86/mach-rdc321x/gpio.c deleted +0 -194

194 lines not on this page · raw message

arch/x86/mach-rdc321x/platform.c deleted +0 -69

69 lines not on this page · raw message

arch/x86/mach-voyager/setup.c +1 -0
index 8e51183..88c3c55 100644

Lines of this file are not shown. View the raw message.

arch/x86/mm/extable.c +6 -0
index 7e8db53..61b41ca 100644

Lines of this file are not shown. View the raw message.

arch/x86/mm/init_32.c +0 -1
index 2cef050..00263bf 100644

Lines of this file are not shown. View the raw message.

arch/x86/mm/kmmio.c +1 -1
index 6a518dd..4f115e0 100644

Lines of this file are not shown. View the raw message.

arch/x86/mm/pat.c +3 -2
index e0ab173..21bc1f7 100644

Lines of this file are not shown. View the raw message.

drivers/acpi/acpica/tbxface.c +14 -3
index c3e841f..ab0aff3 100644

Lines of this file are not shown. View the raw message.

drivers/acpi/osl.c +10 -3
index 1e35f34..eb8980d 100644

Lines of this file are not shown. View the raw message.

drivers/acpi/tables.c +14 -6
index a885295..fec1ae3 100644

Lines of this file are not shown. View the raw message.

drivers/pci/dmar.c +5 -2
index 26c536b..5f33340 100644

Lines of this file are not shown. View the raw message.

drivers/pci/intr_remapping.c +1 -0
index 45effc5..8e44db0 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/rdc321x_wdt.c +1 -1
index bf92802..36e221b 100644

Lines of this file are not shown. View the raw message.

include/acpi/acpiosxf.h +1 -0
index a62720a..ab0b85c 100644

Lines of this file are not shown. View the raw message.

include/acpi/acpixf.h +4 -0
index c8e8cf4..cc40102 100644

Lines of this file are not shown. View the raw message.

include/linux/acpi.h +1 -0
index 6fce2fc..7819915 100644

Lines of this file are not shown. View the raw message.

include/linux/mm.h +2 -1
index 065cdf8..b1ea37f 100644

Lines of this file are not shown. View the raw message.

mm/memory.c +4 -2
index baa999e..2032ad2 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.