x86: unification and cleanup patches 20090326
Subsystems (2)
Individual log and patches are available at:
http://git.kernel.org/?p=linux/kernel/git/jaswinder/linux-2.6-tip.git;a=shortlog;h=x86/core
The following changes since commit 29219683c46cb89edf5c58418b5305b14646d030:
Ingo Molnar (1):
Merge branches 'x86/apic', 'x86/cleanups', 'x86/mm', 'x86/pat', 'x86/setup' and 'x86/signal'; commit 'v2.6.29' into x86/core
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git x86/core
Jaswinder Singh Rajput (3):
x86: unification of cpu/bugs.c
x86: cpu/bugs.c cleanup
x86: unification of module.c
arch/x86/kernel/Makefile | 2 +-
arch/x86/kernel/cpu/Makefile | 5 +-
arch/x86/kernel/cpu/bugs.c | 87 ++++++++++++-----
arch/x86/kernel/cpu/bugs_64.c | 33 ------
arch/x86/kernel/{module_64.c => module.c} | 123 ++++++++++++++++++------
arch/x86/kernel/module_32.c | 152 -----------------------------
6 files changed, 160 insertions(+), 242 deletions(-)
delete mode 100644 arch/x86/kernel/cpu/bugs_64.c
rename arch/x86/kernel/{module_64.c => module.c} (70%)
delete mode 100644 arch/x86/kernel/module_32.cComplete diff:
arch/x86/kernel/Makefile +1 -1
@@ -72,7 +72,7 @@ obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o obj-$(CONFIG_X86_VSMP) += vsmp_64.o obj-$(CONFIG_KPROBES) += kprobes.o -obj-$(CONFIG_MODULES) += module_$(BITS).o +obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o obj-$(CONFIG_KGDB) += kgdb.o
arch/x86/kernel/cpu/Makefile +2 -3
@@ -9,10 +9,9 @@ endif obj-y := intel_cacheinfo.o addon_cpuid_features.o obj-y += proc.o capflags.o powerflags.o common.o -obj-y += vmware.o hypervisor.o +obj-y += vmware.o hypervisor.o bugs.o -obj-$(CONFIG_X86_32) += bugs.o cmpxchg.o -obj-$(CONFIG_X86_64) += bugs_64.o +obj-$(CONFIG_X86_32) += cmpxchg.o obj-$(CONFIG_X86_CPU_DEBUG) += cpu_debug.o
arch/x86/kernel/cpu/bugs.c +62 -25
143 lines not on this page · raw message
arch/x86/kernel/cpu/bugs_64.c deleted +0 -33
@@ -1,33 +0,0 @@ -/* -* Copyright (C) 1994 Linus Torvalds -* Copyright (C) 2000 SuSE -*/ - -#include <linux/kernel.h> -#include <linux/init.h> -#include <asm/alternative.h> -#include <asm/bugs.h> -#include <asm/processor.h> -#include <asm/mtrr.h> -#include <asm/cacheflush.h> - -void __init check_bugs (void ) -{ -identify_boot_cpu (); -#if !defined(CONFIG_SMP ) -printk ("CPU: " ); -print_cpu_info (&boot_cpu_data); -#endif -alternative_instructions (); - -/* -* Make sure the first 2MB area is not mapped by huge pages -* There are typically fixed size MTRRs in there and overlapping -* MTRRs into large pages causes slow downs. -* -* Right now we don't do that with gbpages because there seems -* very little benefit for that case. -*/ -if (!direct_gbpages) -set_memory_4k ((unsigned long )__va (0 ),1 ); -}
arch/x86/kernel/module.c new file +261 -0
261 lines not on this page · raw message
arch/x86/kernel/module_32.c deleted +0 -152
152 lines not on this page · raw message
arch/x86/kernel/module_64.c deleted +0 -194
194 lines not on this page · raw message
Quoted 7 lines · Jaswinder Singh Rajput
Individual log and patches are available at:
http://git.kernel.org/?p=linux/kernel/git/jaswinder/linux-2.6-tip.git;a=shortlog;h=x86/coreThe following changes since commit
29219683c46cb89edf5c58418b5305b14646d030:
Ingo Molnar (1):Merge branches 'x86/apic', 'x86/cleanups', 'x86/mm', 'x86/pat', 'x86/setup' and 'x86/signal'; commit 'v2.6.29' into x86/core
Quoted 8 lines
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.gitx86/coreJaswinder Singh Rajput (3):
x86: unification ofcpu/bugs.c
x86:cpu/bugs.ccleanup
x86: unification ofmodule.c
Jaswinder,
again, please send numbered patches to the list instead of a complete diff.
Thanks,
-Robert
Signature · 3 lines
Advanced Micro Devices, Inc. Operating System Research Center email: [email protected]