From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Oct 2010 14:44:27 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v2.6.37-rc1~138
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=4b37ba90f49d4157ac5628f8d730d3505f176724;p=net-next-2.6.git

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: (21 commits)
  m68knommu: convert to using tracehook_report_syscall_*
  m68knommu: some boards use fixed phy for FEC ethernet
  m68knommu: support the external GPIO based interrupts of the 5272
  m68knommu: mask of vector bits in exception word properly
  m68knommu: change to new flag variables
  m68knommu: Fix MCFUART_TXFIFOSIZE for m548x.
  m68knommu: add basic mmu-less m548x support
  m68knommu: .gitignore vmlinux.lds
  m68knommu: stop using __do_IRQ
  m68knommu: rename PT_OFF_VECTOR to PT_OFF_FORMATVEC.
  m68knommu: add support for Coldfire 547x/548x interrupt controller
  m68k{nommu}: Remove unused DEFINE's from asm-offsets.c
  m68knommu: whitespace cleanup in 68328/entry.S
  m68knommu: Document supported chips in intc-2.c and intc-simr.c.
  m68knommu: fix strace support for 68328/68360
  m68knommu: fix default starting date
  arch/m68knommu: Removing dead 68328_SERIAL_UART2 config option
  arch/m68knommu: Removing dead RAM_{16,32}_MB config option
  arch/m68knommu: Removing dead M68KFPU_EMU config option
  arch/m68knommu: Removing dead RELOCATE config option
  ...
---

4b37ba90f49d4157ac5628f8d730d3505f176724
diff --cc arch/m68knommu/kernel/asm-offsets.c
index 24335022fa2,8156287f19b..ffe02f41ad4
--- a/arch/m68knommu/kernel/asm-offsets.c
+++ b/arch/m68knommu/kernel/asm-offsets.c
@@@ -74,12 -68,11 +68,9 @@@ int main(void
  
  	DEFINE(PT_PTRACED, PT_PTRACED);
  
 -	DEFINE(THREAD_SIZE, THREAD_SIZE);
 -
  	/* Offsets in thread_info structure */
- 	DEFINE(TI_TASK, offsetof(struct thread_info, task));
- 	DEFINE(TI_EXECDOMAIN, offsetof(struct thread_info, exec_domain));
  	DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
  	DEFINE(TI_PREEMPTCOUNT, offsetof(struct thread_info, preempt_count));
- 	DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
  
  	return 0;
  }