Andi Kleen f645f64064 oprofile: Don't report Nehalem as core_2 ... This essentially reverts Linus' earlier 4b9f12a377 commit. Nehalem is not core_2, so it shouldn't be reported as such. However with the earlier arch perfmon patch it will fall back to arch perfmon mode now, so there is no need to fake it as core_2. The only drawback is that Linus will need to patch the arch perfmon support into his oprofile binary now, but I think he can do that. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Robert Richter <robert.richter@amd.com>		2008-10-13 19:25:06 +02:00
..
boot	Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2	2008-10-12 15:50:02 +02:00
configs	Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2	2008-10-12 15:50:02 +02:00
crypto	crypto: crc32c - Use Intel CRC32 instruction	2008-08-29 15:49:50 +10:00
ia32	Merge branch 'linus' into x86/signal	2008-10-12 12:49:27 +02:00
kernel	Merge branch 'linus' into oprofile	2008-10-13 10:52:30 +02:00
kvm	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
lguest	Merge branch 'linus' into x86/x2apic	2008-08-11 11:19:20 +02:00
lib	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
mach-default	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
mach-generic	x86: move dir es7000 to es7000_32.c	2008-09-04 08:08:53 -07:00
mach-rdc321x	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
mach-voyager	kernel/cpu.c: create a CPU_STARTING cpu_chain notifier	2008-09-08 19:25:24 +02:00
math-emu	x86: coding style fixes to arch/x86/math-emu/reg_constant	2008-06-18 15:00:13 +02:00
mm	Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2	2008-10-12 15:50:02 +02:00
oprofile	oprofile: Don't report Nehalem as core_2	2008-10-13 19:25:06 +02:00
pci	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
power	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
vdso	Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus	2008-07-21 16:37:17 +02:00
video	x86: video/fbdev.c: add MODULE_LICENSE	2008-05-04 20:04:46 +02:00
xen	Merge branch 'linus' into x86/xen	2008-10-12 12:37:32 +02:00
Kconfig	Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2	2008-10-12 15:50:02 +02:00
Kconfig.cpu	x86: make processor type select depend on CONFIG_EMBEDDED	2008-10-12 15:44:07 +02:00
Kconfig.debug	x86: usb debug port early console, fix	2008-07-26 17:32:30 +02:00
Makefile	x86, RDC321x: add to mach-default	2008-07-26 13:51:46 +02:00
Makefile_32.cpu	x86: prevent binutils from being "smart" and generating NOPLs for us	2008-09-09 11:52:41 -07:00