1. 22 4月, 2016 6 次提交
  2. 21 4月, 2016 20 次提交
  3. 20 4月, 2016 11 次提交
  4. 19 4月, 2016 3 次提交
    • A
      net: w5100: don't build spi driver without w5100 · b67d1df5
      Arnd Bergmann 提交于
      The w5100-spi driver front-end only makes sense when the w5100
      core driver is enabled, not for a configuration that only has w5300:
      
      drivers/net/built-in.o: In function `w5100_spi_remove':
      drivers/net/ethernet/wiznet/w5100-spi.c:277: undefined reference to `w5100_remove'
      drivers/net/built-in.o: In function `w5100_spi_probe':
      drivers/net/ethernet/wiznet/w5100-spi.c:272: undefined reference to `w5100_probe'
      drivers/net/built-in.o: In function `w5200_spi_init':
      drivers/net/ethernet/wiznet/w5100-spi.c:125: undefined reference to `w5100_ops_priv'
      drivers/net/built-in.o: In function `w5200_spi_readbulk':
      drivers/net/ethernet/wiznet/w5100-spi.c:125: undefined reference to `w5100_ops_priv'
      drivers/net/built-in.o: In function `w5200_spi_writebulk':
      drivers/net/ethernet/wiznet/w5100-spi.c:125: undefined reference to `w5100_ops_priv'
      drivers/net/built-in.o:(.data+0x3ed1c): undefined reference to `w5100_pm_ops'
      
      This adds an appropriate Kconfig dependency.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Fixes: 630cf097 ("net: w5100: support SPI interface mode")
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b67d1df5
    • A
      bpf: avoid warning for wrong pointer cast · 266a0a79
      Arnd Bergmann 提交于
      Two new functions in bpf contain a cast from a 'u64' to a
      pointer. This works on 64-bit architectures but causes a warning
      on all 32-bit architectures:
      
      kernel/trace/bpf_trace.c: In function 'bpf_perf_event_output_tp':
      kernel/trace/bpf_trace.c:350:13: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
        u64 ctx = *(long *)r1;
      
      This changes the cast to first convert the u64 argument into a uintptr_t,
      which is guaranteed to be the same size as a pointer.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Fixes: 9940d67c ("bpf: support bpf_get_stackid() and bpf_perf_event_output() in tracepoint programs")
      Acked-by: NAlexei Starovoitov <ast@kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      266a0a79
    • S
      of_mdio: make of_mdiobus_register_{device|phy}() *void* · b520bd07
      Sergei Shtylyov 提交于
      The results of of_mdiobus_register_{device|phy}() are never checked, so we
      can make  both these functions *void*...
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b520bd07