1. 19 Apr, 2012 1 commit
    • Paul Gortmaker's avatar
      cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile · 7b91747d
      Paul Gortmaker authored
      Most of these have been purged years ago.  This one silently lived
      on until commit 69349c2d
      
          "kconfig: fix IS_ENABLED to not require all options to be defined"
      
      In the above, we use some macro trickery to create a conditional that
      is valid in CPP and in C usage.  However that trickery doesn't sit
      well if you have the legacy "-traditional" flag enabled.  You'll get:
      
        AS      arch/cris/arch-v10/lib/checksum.o
      In file included from <command-line>:4:0:
      include/linux/kconfig.h:23:0: error: syntax error in macro parameter list
      make[2]: *** [arch/cris/arch-v10/lib/checksum.o] Error 1
      
      Everything builds fine w/o "-traditional" so simply drop it from this
      location as well.
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      7b91747d
  2. 05 Apr, 2012 1 commit
  3. 04 Apr, 2012 1 commit
  4. 03 Apr, 2012 10 commits
    • Wanlong Gao's avatar
      cris:fix the wrong function declear · dfb73a07
      Wanlong Gao authored
      Fix wrong declear of write_stack_register.
      Signed-off-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
      Signed-off-by: default avatarJesper Nilsson <jespern@axis.com>
      dfb73a07
    • Jesper Nilsson's avatar
      CRIS: Add _sdata to vmlinux.lds.S · 473e162e
      Jesper Nilsson authored
      Fixes link error:
        LD      vmlinux
      kernel/built-in.o: In function `core_kernel_data':
      (.text+0x13e44): undefined reference to `_sdata'
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      473e162e
    • Jiri Slaby's avatar
      cris: posix_types.h, include asm-generic/posix_types.h · 74f077d2
      Jiri Slaby authored
      Without that I cannot build anything:
      In file included from include/linux/page-flags.h:8:0,
                       from kernel/bounds.c:9:
      include/linux/types.h:25:1: error: unknown type name '__kernel_ino_t'
      include/linux/types.h:29:1: error: unknown type name '__kernel_off_t'
      ...
      Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
      Cc: Mikael Starvik <starvik@axis.com>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      Cc: linux-cris-kernel@axis.com
      74f077d2
    • Jesper Nilsson's avatar
      CRIS: Update documentation · 14c70c3d
      Jesper Nilsson authored
      Change some broken links, remove obsolete information and add
      information about the CRISv32 architecture.
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      14c70c3d
    • Jesper Nilsson's avatar
      cris/arch-v32: cryptocop: Use kzalloc · a52bdec3
      Jesper Nilsson authored
      This avoids unnecessary explicit initialization by allocating zeroed memory.
      
      Signed-off-by: Maxin B. John<maxin.john@gmail.com>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      a52bdec3
    • Wanlong Gao's avatar
      net:removed the unused variable · 17b8c8c0
      Wanlong Gao authored
      removed the unused variable "np" of eth_v10.c.
      Signed-off-by: default avatarWanlong Gao <wanlong.gao@gmail.com>
      Signed-off-by: default avatarJesper Nilsson <jespern@axis.com>
      17b8c8c0
    • Wanlong Gao's avatar
      cris:removed the unused variable · 4bade048
      Wanlong Gao authored
      removed the unused variable "unsigned long tmp".
      Signed-off-by: default avatarWanlong Gao <wanlong.gao@gmail.com>
      Signed-off-by: default avatarJesper Nilsson <jespern@axis.com>
      4bade048
    • Jesper Nilsson's avatar
      CRISv32: Correct name of read_mostly section. · 06e44840
      Jesper Nilsson authored
      54cb27a7 renamed .data.read_mostly to
      .data..read_mostly for all architectures for 2.6.33.
      Reported-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      06e44840
    • Linus Torvalds's avatar
      Merge branch 'drm-prime-dmabuf-initial' of git://people.freedesktop.org/~airlied/linux · 7d6e1cb7
      Linus Torvalds authored
      Pull dma-buf prime support from Dave Airlie:
       "This isn't a majorly urgent thing to have, but we'd like to set the
        stage for working on dma-buf support in the drm drivers for the next
        merge window, so I'd like to push in the initial submission now so
        people have something that we can build on top of.  The code just
        introduces the user interface and internal helper functions for
        drivers to use.
      
        We have driver support under development for i915, nouveau, udl on x86
        and exynos, omapdrm on arm, which we would be aiming for the next
        merge window."
      
      In the -rc1 announcement I asked for people who would use this to
      comment on it, and got severa "Yes please" from people for this and for
      HSI (that I merged earlier).
      
      So far crickets on pohmelfs and the DMA-mapping infrastructure.
      
      * 'drm-prime-dmabuf-initial' of git://people.freedesktop.org/~airlied/linux:
        drm: base prime/dma-buf support (v5)
      7d6e1cb7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · ed359a3b
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Provide device string properly for USB i2400m wimax devices, also
          don't OOPS when providing firmware string.  From Phil Sutter.
      
       2) Add support for sh_eth SH7734 chips, from Nobuhiro Iwamatsu.
      
       3) Add another device ID to USB zaurus driver, from Guan Xin.
      
       4) Loop index start in pool vector iterator is wrong causing MAC to not
          get configured in bnx2x driver, fix from Dmitry Kravkov.
      
       5) EQL driver assumes HZ=100, fix from Eric Dumazet.
      
       6) Now that skb_add_rx_frag() can specify the truesize increment
          separately, do so in f_phonet and cdc_phonet, also from Eric
          Dumazet.
      
       7) virtio_net accidently uses net_ratelimit() not only on the kernel
          warning but also the statistic bump, fix from Rick Jones.
      
       8) ip_route_input_mc() uses fixed init_net namespace, oops, use
          dev_net(dev) instead.  Fix from Benjamin LaHaise.
      
       9) dev_forward_skb() needs to clear the incoming interface index of the
          SKB so that it looks like a new incoming packet, also from Benjamin
          LaHaise.
      
      10) iwlwifi mistakenly initializes a channel entry as 2GHZ instead of
          5GHZ, fix from Stanislav Yakovlev.
      
      11) Missing kmalloc() return value checks in orinoco, from Santosh
          Nayak.
      
      12) ath9k doesn't check for HT capabilities in the right way, it is
          checking ht_supported instead of the ATH9K_HW_CAP_HT flag.  Fix from
          Sujith Manoharan.
      
      13) Fix x86 BPF JIT emission of 16-bit immediate field of AND
          instructions, from Feiran Zhuang.
      
      14) Avoid infinite loop in GARP code when registering sysfs entries.
          From David Ward.
      
      15) rose protocol uses memcpy instead of memcmp in a device address
          comparison, oops.  Fix from Daniel Borkmann.
      
      16) Fix build of lpc_eth due to dev_hw_addr_rancom() interface being
          renamed to eth_hw_addr_random().  From Roland Stigge.
      
      17) Make ipv6 RTM_GETROUTE interpret RTA_IIF attribute the same way
          that ipv4 does.  Fix from Shmulik Ladkani.
      
      18) via-rhine has an inverted bit test, causing suspend/resume
          regressions.  Fix from Andreas Mohr.
      
      19) RIONET assumes 4K page size, fix from Akinobu Mita.
      
      20) Initialization of imask register in sky2 is buggy, because bits are
          "or'd" into an uninitialized local variable.  Fix from Lino
          Sanfilippo.
      
      21) Fix FCOE checksum offload handling, from Yi Zou.
      
      22) Fix VLAN processing regression in e1000, from Jiri Pirko.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)
        sky2: dont overwrite settings for PHY Quick link
        tg3: Fix 5717 serdes powerdown problem
        net: usb: cdc_eem: fix mtu
        net: sh_eth: fix endian check for architecture independent
        usb/rtl8150 : Remove duplicated definitions
        rionet: fix page allocation order of rionet_active
        via-rhine: fix wait-bit inversion.
        ipv6: Fix RTM_GETROUTE's interpretation of RTA_IIF to be consistent with ipv4
        net: lpc_eth: Fix rename of dev_hw_addr_random
        net/netfilter/nfnetlink_acct.c: use linux/atomic.h
        rose_dev: fix memcpy-bug in rose_set_mac_address
        Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
        net/garp: avoid infinite loop if attribute already exists
        x86 bpf_jit: fix a bug in emitting the 16-bit immediate operand of AND
        bonding: emit event when bonding changes MAC
        mac80211: fix oper channel timestamp updation
        ath9k: Use HW HT capabilites properly
        MAINTAINERS: adding maintainer for ipw2x00
        net: orinoco: add error handling for failed kmalloc().
        net/wireless: ipw2x00: fix a typo in wiphy struct initilization
        ...
      ed359a3b
  5. 02 Apr, 2012 27 commits