leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2f9e825d3e
linux/arch/microblaze/include/asm
History
Linus Torvalds 2f9e825d3e Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 
* 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block: (149 commits)
  block: make sure that REQ_* types are seen even with CONFIG_BLOCK=n
  xen-blkfront: fix missing out label
  blkdev: fix blkdev_issue_zeroout return value
  block: update request stacking methods to support discards
  block: fix missing export of blk_types.h
  writeback: fix bad _bh spinlock nesting
  drbd: revert "delay probes", feature is being re-implemented differently
  drbd: Initialize all members of sync_conf to their defaults [Bugz 315]
  drbd: Disable delay probes for the upcomming release
  writeback: cleanup bdi_register
  writeback: add new tracepoints
  writeback: remove unnecessary init_timer call
  writeback: optimize periodic bdi thread wakeups
  writeback: prevent unnecessary bdi threads wakeups
  writeback: move bdi threads exiting logic to the forker thread
  writeback: restructure bdi forker loop a little
  writeback: move last_active to bdi
  writeback: do not remove bdi from bdi_list
  writeback: simplify bdi code a little
  writeback: do not lose wake-ups in bdi threads
  ...

Fixed up pretty trivial conflicts in drivers/block/virtio_blk.c and
drivers/scsi/scsi_error.c as per Jens.
2010-08-10 15:22:42 -07:00
..
asm-compat.h microblaze: Copy ppc asm-compat.h for clean handling of constants in asm and C 2009-09-22 10:10:06 +02:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
atomic.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
auxvec.h
bitops.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
bitsperlong.h asm-generic: introduce asm/bitsperlong.h 2009-06-11 21:02:14 +02:00
bug.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
bugs.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
byteorder.h
cache.h microblaze: Define correct L1_CACHE_SHIFT value 2010-05-06 11:21:59 +02:00
cacheflush.h microblaze: Fix copy_to_user_page macro 2010-08-04 10:22:31 +02:00
checksum.h microblaze: use the generic lib/checksum.c 2009-07-06 10:26:52 +02:00
clinkage.h
cpuinfo.h microblaze: Extend cpuinfo for support write-back caches 2009-12-14 08:44:58 +01:00
cputable.h
cputime.h
current.h microblaze_mmu_v2: Add CURRENT_TASK for entry.S 2009-05-26 16:45:19 +02:00
delay.h
device.h arch/microblaze: Move dma_mask from of_device into pdev_archdata 2010-05-22 00:10:40 -06:00
div64.h
dma-mapping.h microblaze: remove unused HAVE_ARCH_PCI_SET_DMA_MASK 2010-08-04 10:22:37 +02:00
dma.h microblaze: Add isa_dma_bridge_buggy to dma.h 2010-05-06 11:21:58 +02:00
elf.h microblaze: Allow PAGE_SIZE configuration 2010-08-04 10:22:34 +02:00
emergency-restart.h
entry.h percpu: remove per_cpu__ prefix. 2009-10-29 22:34:15 +09:00
errno.h
exceptions.h microblaze: Add KGDB support 2010-08-04 10:45:17 +02:00
fb.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
fcntl.h
flat.h microblaze: remove unused flat_stack_align() definition 2009-06-02 07:54:36 +02:00
ftrace.h microblaze: ftrace: Add dynamic trace support 2009-12-14 08:44:01 +01:00
futex.h microblaze: Fix futex code 2010-04-07 07:27:25 +02:00
gpio.h microblaze: Remove POWERPC reference from Microblaze gpio.h 2009-05-21 15:56:04 +02:00
hardirq.h microblaze: use the generic ack_bad_irq implementation 2009-08-18 10:33:29 +02:00
hw_irq.h
io.h microblaze: Remove ancient code 2010-05-06 11:21:58 +02:00
ioctl.h
ioctls.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
ipcbuf.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
irq_regs.h
irq.h of/irq: Move irq_of_parse_and_map() to common code 2010-06-28 12:41:33 -07:00
irqflags.h microblaze: Add TRACE_IRQFLAGS_SUPPORT 2009-12-14 08:40:09 +01:00
Kbuild microblaze: Kbuild update 2009-05-22 09:50:46 +02:00
kdebug.h
kgdb.h microblaze: Add KGDB support 2010-08-04 10:45:17 +02:00
kmap_types.h kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
linkage.h
local64.h arch: Implement local64_t 2010-06-09 11:12:36 +02:00
local.h
memblock.h lmb: rename to memblock 2010-07-14 17:14:00 +10:00
mman.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
mmu_context_mm.h microblaze_mmu_v2: Context handling - mmu_context.c/h 2009-05-26 16:45:15 +02:00
mmu_context.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
mmu.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
module.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
msgbuf.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
mutex.h
namei.h
page.h Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-05 15:57:35 -07:00
param.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
parport.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
pci-bridge.h of/address: merge of_address_to_resource() 2010-07-05 16:14:26 -06:00
pci.h microblaze: pci-dma: use include/linux/dma-mapping.h 2010-05-06 11:21:59 +02:00
percpu.h
pgalloc.h microblaze: Quiet section mismatch warnings for MMU version 2010-05-06 11:21:58 +02:00
pgtable.h microblaze: Fix consistent code 2010-05-06 11:21:59 +02:00
poll.h
posix_types.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
processor.h microblaze: Remove segment.h 2010-04-01 08:38:19 +02:00
prom.h of/address: Clean up function declarations 2010-08-01 01:42:42 -06:00
ptrace.h microblaze: Add PT_ macros for special purpose regs 2010-01-18 16:35:39 +01:00
pvr.h microblaze: Fix number of pvr regs 2010-08-04 10:22:39 +02:00
registers.h microblaze_mmu_v2: Update process creation for MMU 2009-05-26 16:45:18 +02:00
resource.h
scatterlist.h remove needless ISA_DMA_THRESHOLD 2010-08-07 18:15:50 +02:00
sections.h microblaze_mmu_v2: Page table - ioremap - pgtable.c/h, section update 2009-05-26 16:45:16 +02:00
selfmod.h
sembuf.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
serial.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
setup.h microblaze: Improve ftrace time measuring 2010-08-04 10:22:35 +02:00
shmbuf.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
shmparam.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
sigcontext.h
siginfo.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
signal.h microblaze: clean up signal handling 2009-07-06 10:26:57 +02:00
socket.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
sockios.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
stat.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
statfs.h
string.h microblaze: Guard __HAVE_ARCH macros with __KERNEL__ in string.h 2009-05-21 15:56:08 +02:00
swab.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
syscall.h microblaze: Implement include/asm/syscall.h. 2009-09-21 14:29:21 +02:00
syscalls.h microblaze: use generic syscalls.h 2009-07-06 10:26:59 +02:00
system.h Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze 2010-08-05 08:59:22 -07:00
termbits.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
termios.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
thread_info.h add descriptive comment for TIF_MEMDIE task flag declaration. 2010-05-14 11:13:27 +02:00
timex.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
tlb.h microblaze: Define tlb_flush macro 2009-07-27 07:39:53 +02:00
tlbflush.h microblaze: Fix TLB macros 2010-04-01 08:38:24 +02:00
topology.h of: Provide default of_node_to_nid() implementation. 2010-07-30 00:03:58 -06:00
types.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
uaccess.h microblaze: Fix __copy_to/from_user_inatomic macros 2010-08-02 10:44:03 +02:00
ucontext.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
unaligned.h microblaze: Don't use access_ok for unaligned 2009-06-02 08:39:16 +02:00
unistd.h microblaze: Enable accept4 syscall 2010-01-18 16:35:27 +01:00
unwind.h microblaze: Add stack unwinder 2010-08-04 10:22:35 +02:00
user.h
vga.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
xor.h