Linus Torvalds 4aed2fd8e3 Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits) tracing/kprobes: unregister_trace_probe needs to be called under mutex perf: expose event__process function perf events: Fix mmap offset determination perf, powerpc: fsl_emb: Restore setting perf_sample_data.period perf, powerpc: Convert the FSL driver to use local64_t perf tools: Don't keep unreferenced maps when unmaps are detected perf session: Invalidate last_match when removing threads from rb_tree perf session: Free the ref_reloc_sym memory at the right place x86,mmiotrace: Add support for tracing STOS instruction perf, sched migration: Librarize task states and event headers helpers perf, sched migration: Librarize the GUI class perf, sched migration: Make the GUI class client agnostic perf, sched migration: Make it vertically scrollable perf, sched migration: Parameterize cpu height and spacing perf, sched migration: Fix key bindings perf, sched migration: Ignore unhandled task states perf, sched migration: Handle ignored migrate out events perf: New migration tool overview tracing: Drop cpparg() macro perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call ... Fix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c		2010-08-06 09:30:52 -07:00
..
dec	MIPS: Make various locks static.	2010-02-27 12:53:30 +01:00
emma	MIPS: EMMA2RH: Replace EMMA2RH_SW_IRQ_INTxx with EMMA2RH_SW_IRQ(n)	2010-08-05 13:26:04 +01:00
fw
ip32
lasat
mach-ar7	MIPS: AR7, BCM63xx: fix gpio_to_irq() return value	2010-07-05 17:17:26 +01:00
mach-au1x00	MIPS: au1000_eth: Get ethernet address from platform_data	2010-08-05 13:26:09 +01:00
mach-bcm47xx	MIPS: BCM47xx: Fix nvram_getenv return value.	2010-08-05 13:26:31 +01:00
mach-bcm63xx	MIPS: AR7, BCM63xx: fix gpio_to_irq() return value	2010-07-05 17:17:26 +01:00
mach-cavium-octeon	MIPS: Octeon: Support 256 MSI on PCIe	2010-08-05 13:26:27 +01:00
mach-cobalt
mach-db1x00	MIPS: Alchemy: Extended DB1200 board support.	2010-02-27 12:53:00 +01:00
mach-dec
mach-emma2rh
mach-generic
mach-ip22
mach-ip27	MIPS: cpumask_of_node() should handle -1 as a node	2010-01-12 18:19:37 +01:00
mach-ip28
mach-ip32
mach-jazz
mach-jz4740	MMC: Add support for the controller on JZ4740 SoCs.	2010-08-05 13:26:18 +01:00
mach-lasat
mach-loongson	MIPS: Loongson: Oprofile: add a new do_perfcnt_IRQ()	2010-08-05 13:26:24 +01:00
mach-malta
mach-mipssim
mach-pb1x00	MIPS: Remove dead CONFIG_MTD_PB1550_BOOT, CONFIG_MTD_PB1550_USER	2010-08-05 13:26:00 +01:00
mach-pnx833x	MIPS: Nuke trailing blank lines	2010-02-27 12:53:14 +01:00
mach-pnx8550
mach-powertv	MIPS: PowerTV: Separate PowerTV USB support from non-USB code	2010-08-05 13:26:34 +01:00
mach-rc32434
mach-rm
mach-sibyte	MIPS: Sibyte: Apply M3 workaround only on affected chip types and versions.	2010-04-12 17:26:19 +01:00
mach-tx39xx
mach-tx49xx	MIPS: TX49xx: Define ARCH_KMALLOC_MINALIGN	2010-08-05 13:25:38 +01:00
mach-vr41xx
mach-wrppmc
mach-yosemite
mips-boards	MIPS: Bonito64: Make Loongson independent from Bonito64 code.	2009-12-17 01:57:06 +00:00
octeon	MIPS: Octeon: Allow more than 3.75GB of memory with PCIe	2010-08-05 13:26:31 +01:00
pci
pmc-sierra/msp71xx	MIPS: MSP71xx: Remove dead CONFIG_MTD_PMC_MSP_RAMROOT	2010-08-05 13:26:01 +01:00
sgi	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
sibyte	MIPS: Nuke trailing blank lines	2010-02-27 12:53:14 +01:00
sn	MIPS: IP27: Don't include <linux/topology.h> into <asm/sn/agent.h>.	2010-08-05 13:25:38 +01:00
txx9	MIPS: TXx9: Remove forced serial console setting	2010-02-27 12:53:22 +01:00
vr41xx
xtalk
abi.h	MIPS: Move signal trampolines off of the stack.	2010-04-12 17:26:15 +01:00
addrspace.h
amon.h
arch_hweight.h	MIPS: Create and use asm/arch_hweight.h	2010-08-05 13:26:02 +01:00
asm-offsets.h	kbuild: move asm-offsets.h to include/generated	2009-12-12 13:08:14 +01:00
asm.h
asmmacro-32.h
asmmacro-64.h
asmmacro.h
atomic.h	MIPS: Quit using undefined behavior of ADDU in 64-bit atomic operations.	2010-07-26 19:08:18 +01:00
auxvec.h
barrier.h	MIPS: Optimize spinlocks.	2010-02-27 12:53:42 +01:00
bcache.h
bitops.h	MIPS: Create and use asm/arch_hweight.h	2010-08-05 13:26:02 +01:00
bitsperlong.h
bootinfo.h	MIPS: JZ4740: Add base support for Ingenic JZ4740 System-on-a-Chip	2010-08-05 13:26:12 +01:00
branch.h
break.h	MIPS: kprobe: Add support.	2010-08-05 13:26:29 +01:00
bug.h	MIPS: Convert BUG() to use unreachable()	2009-12-05 09:10:12 -08:00
bugs.h
byteorder.h
cache.h
cachectl.h
cacheflush.h
cacheops.h	MIPS: RM7000: Add support for tertiary cache	2010-08-05 13:26:06 +01:00
cevt-r4k.h
checksum.h
clock.h	MIPS: Loongson 2F: Add CPU frequency scaling support	2009-12-17 01:57:20 +00:00
cmp.h
cmpxchg.h	MIPS: cmpxchg.h: Fix excessive indentation.	2010-04-30 20:52:41 +01:00
compat-signal.h
compat.h	improve sys_newuname() for compat architectures	2010-03-12 15:52:32 -08:00
compiler.h
cop2.h	MIPS: Provide more elevant interface cu2_notifier for CP2 extensions.	2010-08-05 13:25:59 +01:00
cpu-features.h	MIPS: Update comment for cpu_has_clo_clz	2010-08-05 13:26:01 +01:00
cpu-info.h	MIPS: 64-bit: Detect virtual memory size	2010-02-02 19:56:23 +01:00
cpu.h	MIPS: JZ4740: Add base support for Ingenic JZ4740 System-on-a-Chip	2010-08-05 13:26:12 +01:00
cputime.h
current.h	MIPS: Use generic current.h	2010-02-27 12:53:27 +01:00
debug.h
delay.h
device.h	MIPS: Nuke trailing blank lines	2010-02-27 12:53:14 +01:00
div64.h
dma-mapping.h
dma.h
ds1287.h
dsp.h
edac.h
elf.h	MIPS: Enable heap randomization.	2010-08-05 13:26:06 +01:00
emergency-restart.h
errno.h
fb.h
fcntl.h	fix up O_SYNC comments	2009-12-17 11:03:24 -05:00
fixmap.h
floppy.h
fpregdef.h
fpu_emulator.h	MIPS: Fix build breakage if CONFIG_DEBUG_FS is enabled.	2010-04-12 17:26:08 +01:00
fpu.h	MIPS: Cleanup signal code initialization	2009-12-17 01:57:32 +00:00
ftrace.h	MIPS: Loongson: Change the Email address of Wu Zhangjin	2010-02-27 12:53:12 +01:00
futex.h
gcmpregs.h
gic.h
gpio.h
gt64120.h
hardirq.h
hazards.h	MIPS: Alchemy: remove SOC_AU1X00 in favor of MIPS_ALCHEMY	2010-08-05 13:26:06 +01:00
highmem.h
hugetlb.h
hw_irq.h
i8253.h	i8253: Convert i8253_lock to raw_spinlock	2010-03-02 10:28:38 +01:00
i8259.h	MIPS: i8259: Convert IRQ controller lock to raw spinlock.	2010-02-27 12:53:38 +01:00
ide.h
inst.h	MIPS: Add instrunction format for BREAK and SYSCALL	2010-08-05 13:26:28 +01:00
io.h	MIPS: add readl/write_be accessors	2010-02-27 12:53:12 +01:00
ioctl.h
ioctls.h
ipcbuf.h
irq_cpu.h
irq_gt641xx.h
irq_regs.h
irq.h	MIPS: PowerTV: Fix support for timer interrupts with > 64 external IRQs	2010-01-28 00:03:31 +01:00
irqflags.h
isadep.h
jazz.h
jazzdma.h
Kbuild
kdebug.h	MIPS: kprobe: Add support.	2010-08-05 13:26:29 +01:00
kexec.h
kgdb.h	kgdb,mips: Individual register get/set for mips	2010-08-05 09:22:21 -05:00
kmap_types.h
kprobes.h	MIPS: kprobe: Add support.	2010-08-05 13:26:29 +01:00
kspd.h
linkage.h
local64.h	arch: Implement local64_t	2010-06-09 11:12:36 +02:00
local.h	local_t: Remove cpu_local_xx macros	2010-01-05 15:34:49 +09:00
m48t37.h
mc146818-time.h
mc146818rtc.h
mips_mt.h
mipsmtregs.h
mipsprom.h
mipsregs.h	MIPS: Define ST0_NMI in asm/mipsregs.h	2010-08-05 13:26:22 +01:00
mman.h	MIPS: Add missing definition for MADV_HWPOISON.	2009-12-01 16:21:25 +00:00
mmu_context.h	MIPS: Preliminary VDSO	2010-04-12 17:26:14 +01:00
mmu.h	MIPS: Preliminary VDSO	2010-04-12 17:26:14 +01:00
mmzone.h
module.h
msc01_ic.h	MIPS: Nuke trailing blank lines	2010-02-27 12:53:14 +01:00
msgbuf.h
mutex.h
nile4.h	MIPS: Nuke trailing blank lines	2010-02-27 12:53:14 +01:00
paccess.h
page.h	MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET	2010-04-12 17:26:13 +01:00
param.h	MIPS: Simplify param.h by using <asm-generic/param.h>	2010-02-27 12:53:04 +01:00
parport.h	MIPS: Use generic parport.h	2010-02-27 12:53:27 +01:00
pci.h	MIPS: Octeon: Disallow MSI-X interrupt and fall back to MSI interrupts.	2010-08-05 13:26:27 +01:00
percpu.h
pgalloc.h	MIPS: Two-level pagetables for 64-bit kernels with 64KB pages.	2010-02-27 12:53:03 +01:00
pgtable-32.h	MIPS: Implement Read Inhibit/eXecute Inhibit	2010-02-27 12:53:26 +01:00
pgtable-64.h	MIPS: Don't vmap things at address zero.	2010-04-30 20:52:41 +01:00
pgtable-bits.h	MIPS: Implement Read Inhibit/eXecute Inhibit	2010-02-27 12:53:26 +01:00
pgtable.h	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
pmon.h
poll.h
posix_types.h
prefetch.h
processor.h	MIPS: Remove unused task_struct.trap_no field.	2010-08-05 13:26:30 +01:00
ptrace.h	MIPS: kprobes: Define regs_return_value()	2010-08-05 13:26:28 +01:00
r4k-timer.h
r4kcache.h
reboot.h
reg.h
regdef.h
resource.h
rm9k-ocd.h
rtlx.h
scatterlist.h	mips: use use asm-generic/scatterlist.h	2010-05-27 09:12:55 -07:00
seccomp.h
sections.h
segment.h
sembuf.h
serial.h	MIPS: Use generic serial.h	2010-02-27 12:53:27 +01:00
setup.h
sgialib.h	MIPS: ARC: Cleanup unused definitions from sgialib.h	2010-02-27 12:53:45 +01:00
sgiarcs.h
sgidefs.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
sim.h
smp-ops.h
smp.h
smtc_ipi.h
smtc_proc.h
smtc.h
smvp.h
sni.h
socket.h
sockios.h
sparsemem.h	MIPS: Nuke trailing blank lines	2010-02-27 12:53:14 +01:00
spinlock_types.h	MIPS: Optimize spinlocks.	2010-02-27 12:53:42 +01:00
spinlock.h	MIPS: Optimize spinlocks.	2010-02-27 12:53:42 +01:00
spram.h
stackframe.h	MIPS: Loongson-2F: Use CONFIG_CPU_JUMP_WORKAROUNDS to control workarounds.	2010-04-30 20:52:58 +01:00
stacktrace.h
stat.h
statfs.h
string.h
suspend.h
swab.h
sysmips.h
system.h	MIPS: New macro smp_mb__before_llsc.	2010-02-27 12:53:06 +01:00
termbits.h
termios.h
thread_info.h	add descriptive comment for TIF_MEMDIE task flag declaration.	2010-05-14 11:13:27 +02:00
time.h
timex.h
titan_dep.h
tlb.h
tlbdebug.h
tlbflush.h
topology.h
traps.h
txx9irq.h
txx9pio.h
txx9tmr.h
types.h
uaccess.h
uasm.h	MIPS: uasm: Add option to export uasm API.	2010-08-05 13:26:21 +01:00
ucontext.h	MIPS: Use generic ucontext.h	2010-02-27 12:53:27 +01:00
unaligned.h
unistd.h	MIPS: N32: Define getdents64.	2010-07-26 19:08:17 +01:00
user.h
vdso.h	MIPS: Preliminary VDSO	2010-04-12 17:26:14 +01:00
vga.h
vpe.h
war.h
watch.h
wbflush.h
xor.h