kevin/linux
1
Fork 0
Code
f4c1a8379a
linux/include/asm-m32r
History
Linus Torvalds 714f83d5d9 Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 
* 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
  tracing, net: fix net tree and tracing tree merge interaction
  tracing, powerpc: fix powerpc tree and tracing tree interaction
  ring-buffer: do not remove reader page from list on ring buffer free
  function-graph: allow unregistering twice
  trace: make argument 'mem' of trace_seq_putmem() const
  tracing: add missing 'extern' keywords to trace_output.h
  tracing: provide trace_seq_reserve()
  blktrace: print out BLK_TN_MESSAGE properly
  blktrace: extract duplidate code
  blktrace: fix memory leak when freeing struct blk_io_trace
  blktrace: fix blk_probes_ref chaos
  blktrace: make classic output more classic
  blktrace: fix off-by-one bug
  blktrace: fix the original blktrace
  blktrace: fix a race when creating blk_tree_root in debugfs
  blktrace: fix timestamp in binary output
  tracing, Text Edit Lock: cleanup
  tracing: filter fix for TRACE_EVENT_FORMAT events
  ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
  x86: kretprobe-booster interrupt emulation code fix
  ...

Fix up trivial conflicts in
 arch/parisc/include/asm/ftrace.h
 include/linux/memory.h
 kernel/extable.c
 kernel/module.c
2009-04-05 11:04:19 -07:00
..
m32104ut [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
m32700ut m32r: remove dead config symbols from M32R code 2008-02-05 09:44:08 -08:00
mappi2 [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
mappi3 [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
opsput [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
addrspace.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
assembler.h m32r: Rename STI/CLI macros 2007-09-06 11:10:56 +09:00
atomic.h atomic_t: unify all arch definitions 2009-01-06 15:59:10 -08:00
auxvec.h
bitops.h m32r: define __fls 2009-01-03 16:16:54 +10:30
bug.h
bugs.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
byteorder.h byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
cache.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
cachectl.h
cacheflush.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
checksum.h
cputime.h
current.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
delay.h Fix __const_udelay declaration and definition mismatches 2008-02-06 10:41:06 -08:00
device.h
div64.h
dma.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
elf.h [PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY 2008-10-16 15:40:05 +02:00
emergency-restart.h
errno.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
fb.h fbdev: detect primary display device 2007-07-17 10:23:11 -07:00
fcntl.h
flat.h Binfmt_flat: Add minimum support for the Blackfin relocations 2007-10-03 23:41:43 +08:00
ftrace.h tracing: make CALLER_ADDRx overwriteable 2009-03-02 16:49:37 -05:00
futex.h
hardirq.h
hw_irq.h
io.h
ioctl.h
ioctls.h m32r: enable arbitary speed tty rate setting 2007-07-16 09:05:38 -07:00
ipcbuf.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
irq_regs.h
irq.h m32r: remove dead config symbols from M32R code 2008-02-05 09:44:08 -08:00
Kbuild byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
kdebug.h move die notifier handling to common code 2007-05-08 11:15:04 -07:00
kmap_types.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
linkage.h
local.h local_t m32r use architecture specific cmpxchg_local 2008-02-07 08:42:32 -08:00
m32r_mp_fpga.h
m32r.h m32r: Define symbols to unify platform-dependent ICU checks 2007-09-03 11:30:18 +09:00
m32102.h
mc146818rtc.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
mman.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
mmu_context.h [PATCH] x86: PARAVIRT: add hooks to intercept mm creation and destruction 2007-05-02 19:27:14 +02:00
mmu.h NOMMU: Make VMAs per MM as for MMU-mode linux 2009-01-08 12:04:47 +00:00
mmzone.h
module.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
msgbuf.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
mutex.h
page.h PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures 2008-07-24 10:47:21 -07:00
param.h avoid overflows in kernel/time.c 2008-02-08 09:22:39 -08:00
pci.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
percpu.h
pgalloc.h CONFIG_HIGHPTE vs. sub-page page tables. 2008-02-08 09:22:42 -08:00
pgtable-2level.h m32r: fix pte_to_pgoff(), pgoff_to_pte() and __swp_type() macros 2007-05-11 08:29:33 -07:00
pgtable.h mm: introduce pte_special pte bit 2008-04-28 08:58:23 -07:00
poll.h Consolidate asm/poll.h 2007-05-11 08:29:34 -07:00
posix_types.h asm-*/posix_types.h: scrub __GLIBC__ 2008-02-08 09:22:34 -08:00
processor.h aout: move STACK_TOP[_MAX] to asm/processor.h 2008-02-08 09:22:29 -08:00
ptrace.h m32r: convert to generic sys_ptrace 2007-10-16 09:43:04 -07:00
resource.h
rtc.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
s1d13806.h
scatterlist.h Add CONFIG_DEBUG_SG sg validation 2007-10-22 21:20:03 +02:00
sections.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
segment.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
sembuf.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
serial.h
setup.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
shmbuf.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
shmparam.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
sigcontext.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
siginfo.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
signal.h core: remove last users of empty FASTCALL macro 2008-01-30 13:31:17 +01:00
smp.h cpumask: centralize cpu_online_map and cpu_possible_map 2008-12-13 21:19:41 +10:30
socket.h net: new user space API for time stamping of incoming and outgoing packets 2009-02-15 22:43:33 -08:00
sockios.h [NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution 2007-04-25 22:24:04 -07:00
spinlock_types.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
spinlock.h Allow rwlocks to re-enable interrupts 2009-04-02 19:05:11 -07:00
stat.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
statfs.h
string.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
swab.h headers_check fix: m32r, swab.h 2009-02-01 11:01:26 +05:30
syscall.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
system.h sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTER 2008-11-11 08:59:20 +01:00
termbits.h m32r: enable arbitary speed tty rate setting 2007-07-16 09:05:38 -07:00
termios.h m32r: enable arbitary speed tty rate setting 2007-07-16 09:05:38 -07:00
thread_info.h clean up duplicated alloc/free_thread_info 2008-07-25 10:53:28 -07:00
timex.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
tlb.h
tlbflush.h remove unused flush_tlb_pgtables 2007-10-19 11:53:34 -07:00
topology.h
types.h m32r: types: use <asm-generic/int-*.h> for the m32r architecture 2008-05-02 16:18:21 -07:00
uaccess.h asm-m32r/uaccess.h must #include <asm/setup.h> 2008-06-06 11:29:13 -07:00
ucontext.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
unaligned.h kernel: Move arches to use common unaligned access 2008-04-29 08:06:27 -07:00
unistd.h timerfd: fix remaining architectures 2008-02-05 14:37:15 -08:00
user.h Sanitize the type of struct user.u_ar0 2008-02-07 08:42:30 -08:00
vga.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
xor.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00