1. 24 8月, 2011 1 次提交
  2. 31 7月, 2011 2 次提交
    • G
      m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_ · 39847619
      Geert Uytterhoeven 提交于
      These defines are way to generic, and cause conflicts:
      
      drivers/net/wireless/rtlwifi/rtl8192c/../rtl8192ce/reg.h:369:1: warning: "GPIO_IN" redefined
      drivers/net/wireless/rtlwifi/rtl8192c/../rtl8192ce/reg.h:370:1: warning: "GPIO_OUT" redefined
      drivers/net/wireless/rtlwifi/rtl8192se/reg.h:252:1: warning: "GPIO_IN" redefined
      drivers/net/wireless/rtlwifi/rtl8192se/reg.h:253:1: warning: "GPIO_OUT" redefined
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      39847619
    • M
      m68k/atari: Reserve some ST-RAM early on for device buffer use · 217bbd81
      Michael Schmitz 提交于
      Based on an original patch from Michael Schmitz:
      
      Because mem_init() is now called before device init, devices that rely on
      ST-RAM may find all ST-RAM already allocated to other users by the time
      device init happens. In particular, a large initrd RAM disk may use up
      enough of ST-RAM to cause atari_stram_alloc() to resort to
      __get_dma_pages() allocation.
      
      In the current state of Atari memory management, all of RAM is marked
      DMA capable, so __get_dma_pages() may well return RAM that is not in actual
      fact DMA capable. Using this for frame buffer or SCSI DMA buffer causes
      subtle failure.
      
      The ST-RAM allocator has been changed to allocate memory from a pool of
      reserved ST-RAM of configurable size, set aside on ST-RAM init (i.e.
      before mem_init()). As long as this pool is not exhausted, allocation of
      real ST-RAM can be guaranteed.
      
      Other changes:
        - Replace the custom allocator in the ST-RAM pool by the existing allocator
          in the resource subsystem,
        - Remove mem_init_done and its hook, as memory init is now done before
          device init,
        - Remove /proc/stram, as ST-RAM usage now shows up under /proc/iomem, e.g.
      
      	005f2000-006f1fff : ST-RAM Pool
      	  005f2000-0063dfff : atafb
      	  0063e000-00641fff : ataflop
      	  00642000-00642fff : SCSI
      Signed-off-by: NMichael Schmitz <schmitz@debian.org>
      [Andreas Schwab <schwab@linux-m68k.org>: Use memparse()]
      [Geert: Use the resource subsystem instead of a custom allocator]
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      217bbd81
  3. 27 7月, 2011 5 次提交
  4. 26 7月, 2011 1 次提交
  5. 25 7月, 2011 9 次提交
    • G
      m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h · 739735d5
      Geert Uytterhoeven 提交于
      It is not machine-specific, but common irq infrastructure.
      Also add the missing asmlinkage, to match its definition.
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      739735d5
    • G
      m68k: fix some atomic operation asm address modes for ColdFire · 35de6749
      Greg Ungerer 提交于
      The ColdFire processors have a much more limited set of addressing modes
      that can be used for most instructions. A number of the atomic operations
      have already been fixed to limit the addressing modes used with add and
      sub instructions when building for ColdFire. But we missed a few.
      Fix the remaining atomic operations to be clean for ColdFire processors.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      35de6749
    • G
      m68k: use CPU_HAS_NO_BITFIELDS for signal functions · f3c23a28
      Greg Ungerer 提交于
      When reworking bitops.h to be clean for all processor types we introduced
      a CONFIG_CPU_HAS_NO_BITFIELDS define to signal whether this processor type
      supported the bit field instructions. The ARCH_SIG_BITOPS functions for
      m68k use these instruction types. We should base the use of these functions
      (or the generic versions) on the CONFIG_CPU_HAS_NO_BITFIELDS define.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      f3c23a28
    • G
      m68k: merge and clean up delay.h files · 7c946199
      Greg Ungerer 提交于
      The real difference between the mmu and non-mmu varients of the delay.h
      files has nothing to do with having an mmu or not. It is processor family
      differences that means slightly different code. Merge the delay_mm.h and
      delay_no.h files back into a single file.
      
      The primarly difference we need to deal with is whether the processor
      supports a 32bit * 32bit -> 64bit multiply. Without it we need to do some
      shift scaling as well as use a 32bit * 32bit -> 32bit multiply. If building
      for a multi-CPU type kernel then we must use the simpler mult/shift scaling.
      
      This version of delay code allows the CPU32 family to use a 64bit mul,
      since it supports this instruction, the old code did not.
      
      The changes use macros where appropriate to try and optimize constant sized
      udelay times. And it removes the use of a fixed lib function for the non-mmu
      case. Code size on typical kernel configurations is similar, or only larger
      by a few tens of bytes.
      
      Also removed the unused muldiv() code from delay_mm.h.
      
      Build and run tested on ColdFire and ARAnyM. Build tested only on 68328
      and 68360 (CPU32).
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      7c946199
    • G
      m68knommu: correctly use trap_init · 622e9472
      Greg Ungerer 提交于
      Currently trap_init() is an empty function for m68knommu. Instead
      the vectors are being setup as part of the IRQ initialization.
      This is inconsistent with m68k and other architectures.
      
      Change the local init_vectors() to be trap_init(), and init the
      vectors at the correct time during startup. This will help merge of
      m68k and m68knommu trap code in the furture.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      622e9472
    • G
      m68k: merge mmu and non-mmu bitops.h · 171d809d
      Greg Ungerer 提交于
      The following patch merges the mmu and non-mmu versions of the m68k
      bitops.h files. Now there is a good deal of difference between the two
      files, but none of it is actually an mmu specific difference. It is
      all about the specific m68k/coldfire varient we are targeting. So it
      makes an awful lot of sense to merge these into a single bitops.h.
      
      There is a number of ways I can see to factor this code. The approach
      I have taken here is to keep the various versions of each macro/function
      type together. This means that there is some ifdefery with each to handle
      each CPU type.
      
      I have added some comments in a couple of appropriate places to try
      and make it clear what the differences we are dealing with are.
      Specifically the instruction and addressing mode differences we have
      to deal with.
      
      The merged form keeps the same underlying optimizations for each CPU
      type for all the general bit clear/set/change and find bit operations.
      It does switch to using the generic le operations though, instead of
      any local varients.
      
      Build tested on ColdFire, 68328, 68360 (which is cpu32) and 68020+.
      Run tested on ColdFire and ARAnyM.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      Acked-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      171d809d
    • G
      m68k: merge MMU and non MMU versions of system.h · f941f5ca
      Greg Ungerer 提交于
      The non-MMU m68k targets can use the same asm/system.h as the MMU
      targets. So switch the current system_mm.h to be system.h and remove
      system_no.h.
      
      The assembly support code for the non-MMU resume functions needs to
      be modified to match the now common switch_to() macro. Specifically
      this means correctly saving and restoring the status flags in the case
      of the ColdFire resume, and some reordering of the code to not use
      registers before they are saved or after they are restored.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      f941f5ca
    • G
      m68k: merge MMU and non-MMU versions of asm/hardirq.h · 10f939ff
      Greg Ungerer 提交于
      The contents of asm/hardirq.h are pretty strait forward for both the
      MMU (hardirq_mm.h) and non-MMU (hardirq_no.h) include files. Merge the
      two back into a single file.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      10f939ff
    • G
      m68k: merge the non-mmu and mmu versions of module.c · a66af298
      Greg Ungerer 提交于
      The non-mmu and mmu versions of the module loader module.c are
      nearly identical. Merge them back to a single module.c. There is
      a little bit of re-ordering of the struct and enum definitions in
      module.h to keep the ifdefery to a minimum.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      a66af298
  6. 29 5月, 2011 1 次提交
    • E
      ns: Wire up the setns system call · 7b21fddd
      Eric W. Biederman 提交于
      32bit and 64bit on x86 are tested and working.  The rest I have looked
      at closely and I can't find any problems.
      
      setns is an easy system call to wire up.  It just takes two ints so I
      don't expect any weird architecture porting problems.
      
      While doing this I have noticed that we have some architectures that are
      very slow to get new system calls.  cris seems to be the slowest where
      the last system calls wired up were preadv and pwritev.  avr32 is weird
      in that recvmmsg was wired up but never declared in unistd.h.  frv is
      behind with perf_event_open being the last syscall wired up.  On h8300
      the last system call wired up was epoll_wait.  On m32r the last system
      call wired up was fallocate.  mn10300 has recvmmsg as the last system
      call wired up.  The rest seem to at least have syncfs wired up which was
      new in the 2.6.39.
      
      v2: Most of the architecture support added by Daniel Lezcano <dlezcano@fr.ibm.com>
      v3: ported to v2.6.36-rc4 by: Eric W. Biederman <ebiederm@xmission.com>
      v4: Moved wiring up of the system call to another patch
      v5: ported to v2.6.39-rc6
      v6: rebased onto parisc-next and net-next to avoid syscall  conflicts.
      v7: ported to Linus's latest post 2.6.39 tree.
      
      >  arch/blackfin/include/asm/unistd.h     |    3 ++-
      >  arch/blackfin/mach-common/entry.S      |    1 +
      Acked-by: NMike Frysinger <vapier@gentoo.org>
      
      Oh - ia64 wiring looks good.
      Acked-by: NTony Luck <tony.luck@intel.com>
      Signed-off-by: NEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7b21fddd
  7. 27 5月, 2011 3 次提交
  8. 24 5月, 2011 2 次提交
  9. 20 5月, 2011 4 次提交
  10. 13 4月, 2011 1 次提交
  11. 10 4月, 2011 1 次提交
  12. 31 3月, 2011 1 次提交
  13. 24 3月, 2011 7 次提交
  14. 23 3月, 2011 1 次提交
  15. 17 3月, 2011 1 次提交