Commit Graph

365 Commits

Author SHA1 Message Date
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
Linus Torvalds
bad6a5c08c Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc:
  powerpc/ps3: Add rtc-ps3
  powerpc: Hook up rtc-generic, and kill rtc-ppc
  m68k: Hook up rtc-generic
  parisc: rtc: Rename rtc-parisc to rtc-generic
  parisc: rtc: Add missing module alias
  parisc: rtc: platform_driver_probe() fixups
  parisc: rtc: get_rtc_time() returns unsigned int
2009-04-03 09:51:35 -07:00
Linus Torvalds
5de1ccbe51 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (41 commits)
  m68knommu: improve compile arch switch settings
  m68knommu: fix 5407 ColdFire UART vector setup
  m68knommu: fix 5307 ColdFire UART vector setup
  m68knommu: fix 5249 ColdFire UART vector setup
  m68knommu: fix 5249 ColdFire UART setup
  m68knommu: fix end of uart table marker
  m68knommu: switch to using generic_handle_irq()
  m68k: merge the mmu and non-mmu versions of tlbflush.h
  m68knommu: introduce basic clk infrastructure
  m68k: merge the mmu and non-mmu versions of module.h
  m68knommu: add missing interrupt line definition for UART 2
  m68k: merge the mmu and non-mmu versions of mmu_context.h
  m68k: merge the mmu and non-mmu versions of current.h
  m68k: merge the mmu and non-mmu versions of div64.h
  m68k: merge the mmu and non-mmu versions of bugs.h
  m68k: merge the mmu and non-mmu versions of bug.h
  m68k: use the mmu version of cache.h for m68knommu as well
  m68k: use the mmu version of bootinfo.h for m68knommu as well
  m68k: merge the mmu and non-mmu versions of fb.h
  m68k: merge the mmu and non-mmu versions of segment.h
  ...
2009-04-03 09:44:58 -07:00
Alexey Dobriyan
6f2c55b843 Simplify copy_thread()
First argument unused since 2.3.11.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-04-02 19:04:51 -07:00
Geert Uytterhoeven
2ceb3ad705 m68k: Hook up rtc-generic
m68k has been a long time user of the generic RTC abstraction, so hook up
rtc-generic:
  - Create the "rtc-generic" platform device if mach_hwclk is set,
  - Add checks for mach_hwclk, in anticipation of RTC chip drivers being moved
    to drivers/rtc/.

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
2009-04-02 01:05:31 +00:00
Ingo Molnar
8302294f43 Merge branch 'tracing/core-v2' into tracing-for-linus
Conflicts:
	include/linux/slub_def.h
	lib/Kconfig.debug
	mm/slob.c
	mm/slub.c
2009-04-02 00:49:02 +02:00
Bartlomiej Zolnierkiewicz
f94116aeec ide: cleanup <asm-m68k/ide.h>
* Remove superfluous <asm/macints.h> include.

* No need to re-define in/out*() macros as they are no longer used
  by m68k host drivers.

* readl() and writel() are not used by core IDE code.

* Use raw_*_swapw() directly in {falcon,q40}ide.c and remove
  {in,out}sw_swapw() macros.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2009-03-27 12:46:23 +01:00
Bartlomiej Zolnierkiewicz
e354c1d803 ide: remove IDE_ARCH_LOCK (v2)
* Add ->{get,release}_lock methods to struct ide_port_info
  and struct ide_host.

* Convert core IDE code, m68k IDE code and falconide support to use
  ->{get,release}_lock methods instead of ide_{get,release}_lock().

* Remove IDE_ARCH_LOCK.

v2:
* Build fix from Geert updating ide_{get,release}_lock() callers in
  falconide.c.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2009-03-27 12:46:22 +01:00
Bartlomiej Zolnierkiewicz
d15a613ba0 ide: remove IDE_ARCH_INTR (v2)
This micro-optimization is not worth it.  Just always check for
existence of ->ack_intr method in ide_intr() and ide_timer_expiry().

v2:
Fix brown-paper-bag bug spotted by David D. Kilzer.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Cc: "David D. Kilzer" <ddkilzer@kilzer.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2009-03-27 12:46:21 +01:00
Linus Torvalds
4496d937a5 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: irq_node.handler() should return irqreturn_t
  m68k: section mismatch fixes: Atari SCSI
  m68k: section mismatch fixes: DMAsound for Atari
  MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository
  m68k: mac - Add SWIM floppy support
  m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
  m68k: Add install target
2009-03-26 16:15:31 -07:00
David S. Miller
08abe18af1 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
	drivers/net/wimax/i2400m/usb-notif.c
2009-03-26 15:23:24 -07:00
Geert Uytterhoeven
4b2873ba0b m68k: irq_node.handler() should return irqreturn_t
commit b5dc7840b3 ("m68k: introduce irq
controller") reverted the return type of struct irq_node.handler() from
irqreturn_t to int. Change it back to irqreturn_t, else it will give a
compiler warning when irqreturn_t is turned into an enum in the near future:

| arch/m68k/kernel/ints.c:231: warning: assignment from incompatible pointer type

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-26 21:15:30 +01:00
Laurent Vivier
8852ecd974 m68k: mac - Add SWIM floppy support
It allows to read data from a floppy, but not to write to, and to eject the
floppy (useful on our Mac without eject button).

Signed-off-by: Laurent Vivier <Laurent@lvivier.info>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-26 21:15:27 +01:00
Laurent Vivier
7ad93b42bd m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
This patch adds a field "floppy_type" which can take the following values:

MAC_FLOPPY_IWM for an IWM based mac
MAC_FLOPPY_SWIM_ADDR1 for a SWIM based mac with controller at VIA1 + 0x1E000
MAC_FLOPPY_SWIM_ADDR2 for a SWIM based mac with controller at VIA1 + 0x16000
MAC_FLOPPY_IOP for an IOP based mac
MAC_FLOPPY_AV for an AV based mac

Signed-off-by: Laurent Vivier <Laurent@lvivier.info>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-26 21:15:27 +01:00
Laurent Vivier
612bfc9e63 m68k: Add install target
This patch enables the use of "make install" on m68k architecture
to copy kernel to /boot.

Signed-off-by: Laurent Vivier <Laurent@lvivier.info>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-26 21:15:26 +01:00
Greg Ungerer
da4f4a02ab m68k: merge the mmu and non-mmu versions of tlbflush.h
Simple merge of the mmu and non-mmu versions of tlbflush.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2009-03-24 15:17:45 +10:00
Greg Ungerer
a5505464c7 m68k: merge the mmu and non-mmu versions of module.h
Simple merge of the mmu and non-mmu versions of module.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2009-03-24 15:17:45 +10:00
Greg Ungerer
e2545b65de m68knommu: add missing interrupt line definition for UART 2
Signed-off-by:  David Wu <david.wu@arcturusnetworks.com>
Acked-by: Michael Durrant <mdurrant@arcturusnetworks.com>
Acked-by: Oleksandr Zhadan <oleks@arcturusnetworks.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2009-03-24 15:17:45 +10:00
Greg Ungerer
66d73f00a6 m68k: merge the mmu and non-mmu versions of mmu_context.h
Simple merge of the mmu and non-mmu versions of mmu_context.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2009-03-24 15:17:45 +10:00
Greg Ungerer
2844b66035 m68k: merge the mmu and non-mmu versions of current.h
Trivial merge of the mmu and non-mmu versions of current.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:45 +10:00
Greg Ungerer
d20f5aa338 m68k: merge the mmu and non-mmu versions of div64.h
Trivial merge of the mmu and non-mmu versions of div64.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:45 +10:00
Greg Ungerer
76adcb2e81 m68k: merge the mmu and non-mmu versions of bugs.h
Trivial merge of the mmu and non-mmu versions of bugs.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:45 +10:00
Greg Ungerer
dbc367eb69 m68k: merge the mmu and non-mmu versions of bug.h
Trivial merge of the mmu and non-mmu versions of bug.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:44 +10:00
Greg Ungerer
b0ffbf2612 m68k: use the mmu version of cache.h for m68knommu as well
The non-mmu version of cache.h is almost the same as the mmu version.
Merge them.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:44 +10:00
Greg Ungerer
de9f4fc2b7 m68k: use the mmu version of bootinfo.h for m68knommu as well
All m68k varients can use the same mmu version of bootinfo.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:44 +10:00
Greg Ungerer
146b7cdba2 m68k: merge the mmu and non-mmu versions of fb.h
Trivial merge of the mmu and non-mmu versions of fb.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:44 +10:00
Greg Ungerer
4892242a47 m68k: merge the mmu and non-mmu versions of segment.h
Trivial merge of the mmu and non-mmu version of segment.h.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:44 +10:00
Greg Ungerer
872065e78c m68k: merge the mmu and non-mmu versions of ucontext.h
The non-mmu m68k setups can use the mm ucontext.h with no change.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:43 +10:00
Geert Uytterhoeven
c315bd5fdd m68k: Restore correct include guards for <asm/unaligned.h>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2009-03-24 15:17:43 +10:00
Geert Uytterhoeven
15ee04c288 m68k: Use dma_addr_t for scatterlist.dma_address
dma_addr_t (as was used by m68knommu) is more correct than u32.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2009-03-24 15:17:43 +10:00
Greg Ungerer
606333d64e m68k: merge the mmu and non-mmu versions of pgalloc.h
Trivial merge of the mmu and non-mmu version of pgalloc.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:43 +10:00
Greg Ungerer
c8bd42707f m68knommu: mv definition of check_pgt_cache()
Move the definition of check_pgt_cache() to be consistent with where
m68k defines it. (Will make merging of these headers easier later on).

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:43 +10:00
Greg Ungerer
ac55cdfb02 m68k: merge the mmu and non-mmu versions of page_offset.h
Trivial merge of the mmu and non-mmu versions of page_offset.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:43 +10:00
Greg Ungerer
e77d15511f m68k: the one hw_irq.h can be used buy all m68k
The mmu and non-mmu hw_irq.h are identical, revert to a single copy.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:42 +10:00
Greg Ungerer
af85fe9e5e m68k: use non-mmu version of unaligned.h for all m68k
The non-mmu version is appropriately ifdef'ed to be used "as is"
on all m68k varients. So switch to it as the only unaligned.h.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:42 +10:00
Greg Ungerer
f358cbcd49 m68k: use mmu version of elf.h for non-mmu builds as well
Nothing specificly needed to support non-mmu m68k in elf.h,
so just use the mmu one.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:42 +10:00
Greg Ungerer
ebafc17468 m68k: use mmu timex.h for non-mmu setups as well
The non-mmu timex.h can be cleaned up and ends up being identical
to the mmu timex.h, just just use that.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:42 +10:00
Greg Ungerer
34055b806a m68k: use mmu fpu.h for non-mmu builds as well
None of the currently support m68knommu targets have an FPU.
Use the mmu version of fpu.h for all m68k.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:42 +10:00
Greg Ungerer
375d1c7e2d m68k: use mmu scatterlist.h for non-mmu setups as well
There is only trivial differences between the non-mmu and mmu
versions of scatterlist.h. So use the mmu one and remove the non-mmu one.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:42 +10:00
Greg Ungerer
54cae79e52 m68k: merge the mmu and non-mmu versions of mmu.h
Trivial merge of the contents of mmu and non-mmu versions of mmu.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:42 +10:00
Greg Ungerer
bf7058f04a m68knommu: remove no longer used mcfpci.h
The mcfpci.h was only used by the removed (m68knommu) COMEMPCI code.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:42 +10:00
Greg Ungerer
74870998bb m68k: use mmu kmap_types.h for non-mmu setups as well
The mmu version of kmap_types.h is identical to the non-mmu one.
Revert to a single file.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:41 +10:00
Greg Ungerer
bf08d52518 m68k: use the mc146818rtc.h for non-mmu setups as well.
The mmu varient of mc146818rtc.h can be use on the non-mmu builds as well.
Revert to the single mc146818rtc.h file.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:41 +10:00
Greg Ungerer
9a4048a211 m68k: swtich non-mmu setups to use the mmu dma-mapping.h
The mmu version of dma-mapping.h (which is dma-mapping_mm.h) is clean
to be used for non-mmu setups as well. Remove dma-mapping_no.h and
revert dma-mapping_mm.h to dma-mapping.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:41 +10:00
Greg Ungerer
76fdb7d6bd m68k: use the mmu pci.h for m68knommu as well
The (m68knommu) COMEMPCI support has been removed from the kernel,
so now the mmu pci.h can be used on non-mmu setups as well.
Remove the non-mmu pci_no.h and revert the pci_mm.h to be pci.h.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-24 15:17:41 +10:00
Greg Ungerer
7a2cf4af15 m68k: merge the non-MMU and MMU versions of siginfo.h
It is trivial to merge the non-MMU and MMU versions of siginfo.h.
Without a single file "make headers_install" is broken for m68k
(since each of the sub-varients of siginfo.h are not installed).

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2009-03-17 08:47:11 +10:00
Greg Ungerer
9df3d51b59 m68k: use the MMU version of unistd.h for all m68k platforms
The MMU version of unistd.h can be use on non-MMU platrorms as well.
Without a single file "make headers_install" is broken for m68k
(since each of the sub-varients of unistd.h are not installed).

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2009-03-17 08:44:55 +10:00
Greg Ungerer
8dba99e077 m68k: merge the non-MMU and MMU versions of signal.h
It is trivial to merge the non-MMU and MMU versions of signal.h.
Without a single file "make headers_install" is broken for m68k
(since each of the sub-varients of signal.h are not installed).

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2009-03-17 08:44:42 +10:00
Greg Ungerer
230d1866a9 m68k: merge the non-MMU and MMU versions of ptrace.h
It is trivial to merge the non-MMU and MMU versions of ptrace.h.
Without a single file "make headers_install" is broken for m68k
(since each of the sub-varients of ptrace.h are not installed).

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2009-03-17 08:44:42 +10:00
Greg Ungerer
c5f5d3e6ed m68k: use MMU version of setup.h for both MMU and non-MMU
The MMU version of setup.h can be used for all m68k platforms.
Without a single file "make headers_install" is broken for m68k
(since each of the sub-varients of setup.h are not installed).

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2009-03-17 08:44:41 +10:00