diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 17:51:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 17:51:18 -0800 |
| commit | 048f039f3ee39417d5a6a1eb73bf01f935e9ed3f (patch) | |
| tree | b7064e7874528e72500e1ed57bc054974822687c /arch/m68knommu/platform/68360/entry.S | |
| parent | b90be8662b1d7bd84637edb8f96e904f865a2fe2 (diff) | |
| parent | 86d306c96046be597147d9f8ff163a052b3845d8 (diff) | |
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:
m68knommu: set flow handler for secondary interrupt controller of 5249
m68knommu: remove use of IRQ_FLG_LOCK from 68360 platform support
m68knommu: fix dereference of port.tty
m68knommu: add missing linker __modver section
m68knommu: fix mis-named variable int set_irq_chip loop
m68knommu: add optimize memmove() function
m68k: remove arch specific non-optimized memcmp()
m68knommu: fix use of un-defined _TIF_WORK_MASK
m68knommu: Rename m548x_wdt.c to m54xx_wdt.c
m68knommu: fix m548x_wdt.c compilation after headers renaming
m68knommu: Remove dependencies on nonexistent M68KNOMMU
Diffstat (limited to 'arch/m68knommu/platform/68360/entry.S')
| -rw-r--r-- | arch/m68knommu/platform/68360/entry.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68knommu/platform/68360/entry.S b/arch/m68knommu/platform/68360/entry.S index 8a28788c0ee..46c1b18c9dc 100644 --- a/arch/m68knommu/platform/68360/entry.S +++ b/arch/m68knommu/platform/68360/entry.S @@ -104,7 +104,6 @@ Luser_return: movel %d1,%a2 1: move %a2@(TI_FLAGS),%d1 /* thread_info->flags */ - andl #_TIF_WORK_MASK,%d1 jne Lwork_to_do RESTORE_ALL |