Merge branch 'linus' into x86/pebs

Conflicts: arch/x86/Kconfig.cpu arch/x86/kernel/cpu/intel.c arch/x86/kernel/setup_64.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-11-13 07:31:07 +00:00 · 2008-07-25 11:37:07 +02:00 · 2008-07-25 11:37:07 +02:00 · 0e2f65ee30
commit 0e2f65ee30
parent da7878d75b fb2e405fc1
7552 changed files with 628349 additions and 548384 deletions
--- a/arch/Kconfig
+++ b/arch/Kconfig
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
--- a/arch/alpha/oprofile/common.c
+++ b/arch/alpha/oprofile/common.c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
--- a/arch/arm/common/rtctime.c
+++ b/arch/arm/common/rtctime.c
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
--- a/arch/arm/common/sharpsl_pm.c
+++ b/arch/arm/common/sharpsl_pm.c
--- a/arch/arm/configs/at91cap9adk_defconfig
+++ b/arch/arm/configs/at91cap9adk_defconfig
--- a/arch/arm/configs/at91rm9200dk_defconfig
+++ b/arch/arm/configs/at91rm9200dk_defconfig
--- a/arch/arm/configs/at91rm9200ek_defconfig
+++ b/arch/arm/configs/at91rm9200ek_defconfig
--- a/arch/arm/configs/at91sam9260ek_defconfig
+++ b/arch/arm/configs/at91sam9260ek_defconfig
--- a/arch/arm/configs/at91sam9261ek_defconfig
+++ b/arch/arm/configs/at91sam9261ek_defconfig
--- a/arch/arm/configs/at91sam9263ek_defconfig
+++ b/arch/arm/configs/at91sam9263ek_defconfig
--- a/arch/arm/configs/at91sam9g20ek_defconfig
+++ b/arch/arm/configs/at91sam9g20ek_defconfig
--- a/arch/arm/configs/at91sam9rlek_defconfig
+++ b/arch/arm/configs/at91sam9rlek_defconfig
--- a/arch/arm/configs/ateb9200_defconfig
+++ b/arch/arm/configs/ateb9200_defconfig
--- a/arch/arm/configs/collie_defconfig
+++ b/arch/arm/configs/collie_defconfig
--- a/arch/arm/configs/corgi_defconfig
+++ b/arch/arm/configs/corgi_defconfig
--- a/arch/arm/configs/ecbat91_defconfig
+++ b/arch/arm/configs/ecbat91_defconfig
--- a/arch/arm/configs/ep93xx_defconfig
+++ b/arch/arm/configs/ep93xx_defconfig
--- a/arch/arm/configs/eseries_pxa_defconfig
+++ b/arch/arm/configs/eseries_pxa_defconfig
--- a/arch/arm/configs/ezx_defconfig
+++ b/arch/arm/configs/ezx_defconfig
--- a/arch/arm/configs/imx27ads_defconfig
+++ b/arch/arm/configs/imx27ads_defconfig
--- a/arch/arm/configs/iop13xx_defconfig
+++ b/arch/arm/configs/iop13xx_defconfig
--- a/arch/arm/configs/iop32x_defconfig
+++ b/arch/arm/configs/iop32x_defconfig
--- a/arch/arm/configs/iop33x_defconfig
+++ b/arch/arm/configs/iop33x_defconfig
--- a/arch/arm/configs/ixp2000_defconfig
+++ b/arch/arm/configs/ixp2000_defconfig
--- a/arch/arm/configs/ixp23xx_defconfig
+++ b/arch/arm/configs/ixp23xx_defconfig
--- a/arch/arm/configs/ixp4xx_defconfig
+++ b/arch/arm/configs/ixp4xx_defconfig
--- a/arch/arm/configs/kafa_defconfig
+++ b/arch/arm/configs/kafa_defconfig
--- a/arch/arm/configs/kb9202_defconfig
+++ b/arch/arm/configs/kb9202_defconfig
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
--- a/arch/arm/configs/ks8695_defconfig
+++ b/arch/arm/configs/ks8695_defconfig
--- a/arch/arm/configs/loki_defconfig
+++ b/arch/arm/configs/loki_defconfig
--- a/arch/arm/configs/lpd270_defconfig
+++ b/arch/arm/configs/lpd270_defconfig
--- a/arch/arm/configs/lpd7a404_defconfig
+++ b/arch/arm/configs/lpd7a404_defconfig
--- a/arch/arm/configs/mv78xx0_defconfig
+++ b/arch/arm/configs/mv78xx0_defconfig
--- a/arch/arm/configs/mx31ads_defconfig
+++ b/arch/arm/configs/mx31ads_defconfig
--- a/arch/arm/configs/mx31litekit_defconfig
+++ b/arch/arm/configs/mx31litekit_defconfig
--- a/arch/arm/configs/netx_defconfig
+++ b/arch/arm/configs/netx_defconfig
--- a/arch/arm/configs/onearm_defconfig
+++ b/arch/arm/configs/onearm_defconfig
--- a/arch/arm/configs/orion5x_defconfig
+++ b/arch/arm/configs/orion5x_defconfig
--- a/arch/arm/configs/pcm037_defconfig
+++ b/arch/arm/configs/pcm037_defconfig
--- a/arch/arm/configs/pcm038_defconfig
+++ b/arch/arm/configs/pcm038_defconfig
--- a/arch/arm/configs/picotux200_defconfig
+++ b/arch/arm/configs/picotux200_defconfig
--- a/arch/arm/configs/pnx4008_defconfig
+++ b/arch/arm/configs/pnx4008_defconfig
--- a/arch/arm/configs/qil-a9260_defconfig
+++ b/arch/arm/configs/qil-a9260_defconfig
--- a/arch/arm/configs/realview-smp_defconfig
+++ b/arch/arm/configs/realview-smp_defconfig
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
--- a/arch/arm/configs/rpc_defconfig
+++ b/arch/arm/configs/rpc_defconfig
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
--- a/arch/arm/configs/sam9_l9260_defconfig
+++ b/arch/arm/configs/sam9_l9260_defconfig
--- a/arch/arm/configs/spitz_defconfig
+++ b/arch/arm/configs/spitz_defconfig
--- a/arch/arm/configs/tct_hammer_defconfig
+++ b/arch/arm/configs/tct_hammer_defconfig
--- a/arch/arm/configs/trizeps4_defconfig
+++ b/arch/arm/configs/trizeps4_defconfig
--- a/arch/arm/configs/usb-a9260_defconfig
+++ b/arch/arm/configs/usb-a9260_defconfig
--- a/arch/arm/configs/usb-a9263_defconfig
+++ b/arch/arm/configs/usb-a9263_defconfig
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
--- a/arch/arm/configs/xm_x270_defconfig
+++ b/arch/arm/configs/xm_x270_defconfig
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
--- a/arch/arm/kernel/atags.c
+++ b/arch/arm/kernel/atags.c
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
--- a/arch/arm/kernel/ecard.h
+++ b/arch/arm/kernel/ecard.h
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
--- a/arch/arm/kernel/kgdb.c
+++ b/arch/arm/kernel/kgdb.c
--- a/arch/arm/kernel/kprobes.c
+++ b/arch/arm/kernel/kprobes.c
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/kernel/stacktrace.c
+++ b/arch/arm/kernel/stacktrace.c
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/lib/copy_template.S
+++ b/arch/arm/lib/copy_template.S
--- a/arch/arm/lib/memmove.S
+++ b/arch/arm/lib/memmove.S
--- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S
--- a/arch/arm/lib/memzero.S
+++ b/arch/arm/lib/memzero.S
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
--- a/Show more
+++ b/Show more