diff options
| author | Dan Murphy <dmurphy@ti.com> | 2012-02-16 12:56:10 -0600 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2012-02-16 12:58:55 -0600 |
| commit | a80710ad1a7ddfee509425056ac5e0483d88fbaa (patch) | |
| tree | d75b67449c10db2fe12daffe19e047febbfee09c /drivers/net/wireless/bcmdhd/include/linuxver.h | |
| parent | e5493a63c6e84a0066796c81477b92829363450b (diff) | |
| download | kernel_samsung_espresso10-a80710ad1a7ddfee509425056ac5e0483d88fbaa.zip kernel_samsung_espresso10-a80710ad1a7ddfee509425056ac5e0483d88fbaa.tar.gz kernel_samsung_espresso10-a80710ad1a7ddfee509425056ac5e0483d88fbaa.tar.bz2 | |
Merge branch 'android-omap-3.0' into p-android-omap-3.0
Conflicts:
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/omap_twl.c
drivers/gpu/pvr/ion.c
drivers/gpu/pvr/ion.h
drivers/gpu/pvr/mm.c
drivers/gpu/pvr/omap4/syslocal.h
drivers/gpu/pvr/sgxfeaturedefs.h
drivers/mmc/host/omap_hsmmc.c
drivers/usb/gadget/android.c
drivers/video/hdmi_ti_4xxx_ip.c
drivers/video/omap2/dss/dispc.c
drivers/video/omap2/dss/hdmi.c
fs/proc/base.c
include/video/hdmi_ti_4xxx_ip.h
sound/soc/codecs/twl6040.c
sound/soc/omap/sdp4430.c
Change-Id: Ia1edb1885eff7554aead12780898502df08b7c83
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/include/linuxver.h')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/include/linuxver.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/include/linuxver.h b/drivers/net/wireless/bcmdhd/include/linuxver.h index 96844db..d269e66 100644 --- a/drivers/net/wireless/bcmdhd/include/linuxver.h +++ b/drivers/net/wireless/bcmdhd/include/linuxver.h @@ -22,7 +22,7 @@ * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. * - * $Id: linuxver.h,v 13.53.2.2 2010-12-22 23:47:26 Exp $ + * $Id: linuxver.h 280266 2011-08-28 04:18:20Z $ */ @@ -482,7 +482,11 @@ typedef struct { #define DBG_THR(x) #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)) +#define SMP_RD_BARRIER_DEPENDS(x) smp_read_barrier_depends(x) +#else #define SMP_RD_BARRIER_DEPENDS(x) smp_rmb(x) +#endif #define PROC_START(thread_func, owner, tsk_ctl, flags) \ @@ -507,6 +511,18 @@ typedef struct { (tsk_ctl)->thr_pid = -1; \ } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)) +#define DAEMONIZE(a) daemonize(a); \ + allow_signal(SIGKILL); \ + allow_signal(SIGTERM); +#else /* Linux 2.4 (w/o preemption patch) */ +#define RAISE_RX_SOFTIRQ() \ + cpu_raise_softirq(smp_processor_id(), NET_RX_SOFTIRQ) +#define DAEMONIZE(a) daemonize(); \ + do { if (a) \ + strncpy(current->comm, a, MIN(sizeof(current->comm), (strlen(a) + 1))); \ + } while (0); +#endif /* LINUX_VERSION_CODE */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) |