Eric Lee / linux-smarc-t335x-v3.2

26 Jul, 2011

1 commit

  • 138051659   Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 ... Browse Code »

    * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
    staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
    staging:iio:kfifo_buf fix double initialization of the ring device structure.
    staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
    staging:iio:imu fix missing register table index for some channels
    spectra: enable device before poking it
    staging: rts_pstor: Fix a miswriting
    staging/lirc_bt829: Return -ENODEV when no hardware is found.
    staging/lirc_parallel: remove pointless prototypes.
    staging/lirc_parallel: fix panic on rmmod
    staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
    Staging: zram: Fix kunmapping order
    Revert "gma500: Fix dependencies"
    gma500: Add medfield header
    gma500: wire up the mrst i2c bus from chip_info
    gma500: Fix DPU build
    gma500: Clean up the DPU config and make it runtime
    gma500: resync with Medfield progress
    gma500: Use the mrst helpers and power control for mode commit
    gma500@ Fix backlight range error
    gma500: More Moorestown muddle meddling means MM maybe might modeset
    ...

    Fix up fairly trivial conflicts all over, mostly due to header file
    cleanup conflicts, but some deleted files and some just context changes:
    - Documentation/feature-removal-schedule.txt
    - drivers/staging/bcm/headers.h
    - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
    - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
    - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
    - drivers/staging/brcm80211/brcmfmac/wl_iw.c
    - drivers/staging/et131x/et131x_netdev.c
    - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
    - drivers/staging/rtl8192e/r8192E.h
    - drivers/staging/usbip/userspace/src/utils.h

    Linus Torvalds
     

24 Jul, 2011

1 commit

09 Jul, 2011

1 commit

06 Jul, 2011

3 commits

20 Jun, 2011

1 commit

  • 219eb47e6   net/staging: add needed interrupt.h and hardirq.h includes ... Browse Code »

    Made necessary by commit a6b7a407865a ("net: remove
    interrupt.h inclusion from netdevice.h").

    Fixes these build errors:

    drivers/staging/brcm80211/brcmfmac/dhd_linux.c:1212:3: error: implicit declaration of function 'in_interrupt'
    drivers/staging/brcm80211/brcmfmac/dhd_linux.c:1390:4: error: implicit declaration of function 'tasklet_schedule'
    drivers/staging/brcm80211/brcmfmac/dhd_linux.c:1988:3: error: implicit declaration of function 'tasklet_init'
    drivers/staging/brcm80211/brcmfmac/dhd_linux.c:2288:5: error: implicit declaration of function 'tasklet_kill'
    drivers/staging/brcm80211/brcmfmac/dhd_linux.c:232:24: error: field 'tasklet' has incomplete type
    drivers/staging/brcm80211/brcmfmac/wl_iw.c:3670:2: error: implicit declaration of function 'in_interrupt'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:1349:3: error: implicit declaration of function 'free_irq'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:1352:2: error: implicit declaration of function 'tasklet_kill'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:1538:4: error: implicit declaration of function 'tasklet_schedule'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:765:2: error: implicit declaration of function 'tasklet_init'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:817:2: error: implicit declaration of function 'request_irq'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:817:31: error: 'IRQF_SHARED' undeclared (first use in this function)
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.h:65:24: error: field 'tasklet' has incomplete type
    drivers/staging/rtl8187se/ieee80211/ieee80211.h:994:24: error: field 'ps_task' has incomplete type
    drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c:1790:3: error: implicit declaration of function 'tasklet_schedule'
    drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c:2590:2: error: implicit declaration of function 'tasklet_init'
    drivers/staging/rtl8187se/r8180.h:461:24: error: field 'irq_rx_tasklet' has incomplete type
    drivers/staging/rtl8187se/r8180_core.c:2764:2: error: implicit declaration of function 'tasklet_init'
    drivers/staging/rtl8187se/r8180_core.c:2954:2: error: implicit declaration of function 'request_irq'
    drivers/staging/rtl8187se/r8180_core.c:2954:55: error: 'IRQF_SHARED' undeclared (first use in this function)
    drivers/staging/rtl8187se/r8180_core.c:3641:4: error: implicit declaration of function 'free_irq'
    drivers/staging/rtl8187se/r8180_core.c:4026:3: error: implicit declaration of function 'tasklet_schedule'
    drivers/staging/rtl8192e/ieee80211/ieee80211.h:2000:24: error: field 'ps_task' has incomplete type
    drivers/staging/rtl8192e/r8192E.h:909:24: error: field 'irq_rx_tasklet' has incomplete type
    drivers/staging/rtl8192e/r8192E.h:910:24: error: field 'irq_tx_tasklet' has incomplete type
    drivers/staging/rtl8192e/r8192E.h:911:31: error: field 'irq_prepare_beacon_tasklet' has incomplete type
    drivers/staging/rtl8192e/r8192E_core.c:2008:2: error: implicit declaration of function 'tasklet_init'
    drivers/staging/rtl8192e/r8192E_core.c:2412:54: error: 'IRQF_SHARED' undeclared (first use in this function)
    drivers/staging/rtl8192e/r8192E_core.c:2412:9: error: implicit declaration of function 'request_irq'
    drivers/staging/rtl8192e/r8192E_core.c:4640:4: error: implicit declaration of function 'free_irq'
    drivers/staging/rtl8192e/r8192E_core.c:620:2: error: implicit declaration of function 'synchronize_irq'
    drivers/staging/rtl8192e/r8192E_core.c:913:3: error: implicit declaration of function 'tasklet_schedule'
    drivers/staging/rtl8192u/ieee80211/ieee80211.h:1993:24: error: field 'ps_task' has incomplete type

    Signed-off-by: Stephen Rothwell
    Signed-off-by: David S. Miller

    Stephen Rothwell
     

08 Apr, 2011

1 commit

  • df9b29d13   Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 ... Browse Code »

    * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (28 commits)
    staging: usbip: bugfix for isochronous packets and optimization
    staging: usbip: bugfix add number of packets for isochronous frames
    staging: usbip: bugfixes related to kthread conversion
    staging: usbip: fix shutdown problems.
    staging: hv: Fix GARP not sent after Quick Migration
    staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
    staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
    staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
    staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
    staging: IIO: IMU: ADIS16400: Add delay after self test
    staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
    staging/rtl81*: build as loadable modules only
    staging: brcm80211: removed 'is_amsdu causing toss' log spam
    staging: brcm80211: fix for 'Short CCK' log spam
    staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
    staging: memrar: remove driver from tree
    staging: sep: remove last memrar remnants
    staging: fix hv_mouse build, needs delay.h
    staging: fix olpc_dcon build errors
    staging: sm7xx: fixed defines
    ...

    Fix up trivial conflict in drivers/staging/memrar/memrar_handler.c
    (deleted vs trivial spelling fixes)

    Linus Torvalds
     

05 Apr, 2011

1 commit

  • 84ba253b0   staging/rtl81*: build as loadable modules only ... Browse Code »

    These 3 drivers contain much duplicated (triplicated) code, so
    building them as built-in results in many errors like:

    (.text+0x1b160): multiple definition of `ieee80211_sta_ps_sleep'

    Prevent this configuration by making them all buildable only as
    loadable modules (similar to the vt665[56] patch last week).

    Signed-off-by: Randy Dunlap
    Signed-off-by: Greg Kroah-Hartman

    Randy Dunlap
     

31 Mar, 2011

1 commit

15 Mar, 2011

1 commit

08 Mar, 2011

1 commit

17 Nov, 2010

1 commit

  • f36d83a8c   staging: rtl8187se: Change panic to warn when RF switch turned off ... Browse Code »

    This driver issues a kernel panic over conditions that do not
    justify such drastic action. Change these to log entries with
    a stack dump.

    This patch fixes the system crash reported in
    https://bugs.launchpad.net/ubuntu/+source/linux/+bug/674285.

    Signed-off-by: Larry Finger
    Reported-and-Tested-by: Robie Basik
    Cc: Stable
    Signed-off-by: Greg Kroah-Hartman

    Larry Finger
     

08 Oct, 2010

1 commit

06 Oct, 2010

1 commit

22 Sep, 2010

5 commits

05 Sep, 2010

1 commit

01 Sep, 2010

2 commits

11 Aug, 2010

1 commit

  • dca413063   param: remove unnecessary writable charp ... Browse Code »

    sysfs-writable charp arguments need to be locked against modification
    (since the old ones may be kfreed underneath us). String arguments
    are much simpler, so use them for small strings (eg. IFNAMSIZ).

    lkdtm only uses the parameters at module initialization time, so there's
    not much point making them writable.

    Signed-off-by: Rusty Russell
    Reviewed-by: Takashi Iwai
    Tested-by: Phil Carmody
    Cc: Andrew Morton
    Cc: M. Mohan Kumar
    Cc: Greg Kroah-Hartman
    Cc: Bartlomiej Zolnierkiewicz
    Cc: Jeff Mahoney
    Cc: Julia Lawall
    Cc: devel@driverdev.osuosl.org

    Rusty Russell
     

06 Aug, 2010

1 commit

30 Jun, 2010

1 commit

  • f84f927e0   Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2 ... Browse Code »

    In commit bbfb5652, the spacing in the definitions of eqMacAddr and cpMacAddr
    in drivers/staging/rtl8187se/r8180_core.c were changed to conform to kernel
    standards. These definitions were duplicates of lines found in
    drivers/staging/rtl8187se/ieee80211/dot11d.h. Once the change was made, the
    following warnings were emitted:

    CC [M] drivers/staging/rtl8187se/r8180_core.o
    drivers/staging/rtl8187se/r8180_core.c:69:0: warning: "eqMacAddr" redefined
    drivers/staging/rtl8187se/ieee80211/dot11d.h:39:0: note: this is the location of the previous definition
    drivers/staging/rtl8187se/r8180_core.c:70:0: warning: "cpMacAddr" redefined
    drivers/staging/rtl8187se/ieee80211/dot11d.h:40:0: note: this is the location of the previous definition

    The fix is to keep only the difinition in the header file.

    Signed-off-by: Larry Finger
    Signed-off-by: Greg Kroah-Hartman

    Larry Finger
     

19 Jun, 2010

1 commit

  • 0374e91c9   Staging: rtl81xx: Fix build problems when CONFIG_CRYPTO=n ... Browse Code »

    Select CONFIG_CRYPTO for all rtl81xx wireless drivers

    ... to avoid build problems like:

    ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8187se/r8187se.ko] undefined!
    ERROR: "crypto_alloc_base" [drivers/staging/rtl8187se/r8187se.ko] undefined!
    ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
    ERROR: "crypto_alloc_base" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
    ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
    ERROR: "crypto_alloc_base" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
    ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8192e/r8192e_pci.ko] undefined!
    ERROR: "crypto_alloc_base" [drivers/staging/rtl8192e/r8192e_pci.ko] undefined!

    when drivers are built as modules but CONFIG_CRYPTO=n.

    Signed-off-by: Andreas Herrmann
    Signed-off-by: Greg Kroah-Hartman

    Andreas Herrmann
     

18 May, 2010

1 commit

  • 94002c07f   Staging: Use kmemdup ... Browse Code »

    Use kmemdup when some other buffer is immediately copied into the
    allocated region.

    A simplified version of the semantic patch that makes this change is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @@
    expression from,to,size,flag;
    statement S;
    @@

    - to = \(kmalloc\|kzalloc\)(size,flag);
    + to = kmemdup(from,size,flag);
    if (to==NULL || ...) S
    - memcpy(to, from, size);
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Greg Kroah-Hartman

    Julia Lawall
     

15 May, 2010

3 commits

12 May, 2010

7 commits

30 Mar, 2010

1 commit

  • 5a0e3ad6a   include cleanup: Update gfp.h and slab.h includes to prepare for breaking implic… ... Browse Code »

    …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

05 Mar, 2010

1 commit