redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  staging: tidspbridge: fix compilation on dsp clock functions
  staging: octeon-ethernet: Add missing #includes.
  Staging: zcache: signedness bug in tmem_get()
  staging: zcache: fix crash on high memory swap
  staging: brcm80211: SPARC build error fix
  staging: brcm80211: fix compile error on non-x86 archs since 3.0 kernel
hifive-unleashed-5.1
Linus Torvalds 2011-08-26 13:03:12 -07:00
parent 96d185c765 1b965f1891
commit 0cf0adb073
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/brcm80211/brcmsmac/otp.c
View File

@ -16,6 +16,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h>
#include <brcm_hw_ids.h> #include <brcm_hw_ids.h>
#include <chipcommon.h> #include <chipcommon.h>

1
drivers/staging/brcm80211/brcmsmac/types.h
View File

@ -18,6 +18,7 @@
#define _BRCM_TYPES_H_ #define _BRCM_TYPES_H_
#include <linux/types.h> #include <linux/types.h>
#include <linux/io.h>
/* Bus types */ /* Bus types */
#define SI_BUS 0 /* SOC Interconnect */ #define SI_BUS 0 /* SOC Interconnect */

1
drivers/staging/octeon/ethernet-rgmii.c
View File

@ -26,6 +26,7 @@
**********************************************************************/ **********************************************************************/
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/interrupt.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <net/dst.h> #include <net/dst.h>

1
drivers/staging/octeon/ethernet-spi.c
View File

@ -26,6 +26,7 @@
**********************************************************************/ **********************************************************************/
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/interrupt.h>
#include <net/dst.h> #include <net/dst.h>
#include <asm/octeon/octeon.h> #include <asm/octeon/octeon.h>

1
drivers/staging/tidspbridge/core/dsp-clock.c
View File

@ -209,7 +209,6 @@ int dsp_clk_enable(enum dsp_clk_id clk_id)
break; break;
#ifdef CONFIG_OMAP_MCBSP #ifdef CONFIG_OMAP_MCBSP
case MCBSP_CLK: case MCBSP_CLK:
omap_mcbsp_set_io_type(MCBSP_ID(clk_id), OMAP_MCBSP_POLL_IO);
omap_mcbsp_request(MCBSP_ID(clk_id)); omap_mcbsp_request(MCBSP_ID(clk_id));
omap2_mcbsp_set_clks_src(MCBSP_ID(clk_id), MCBSP_CLKS_PAD_SRC); omap2_mcbsp_set_clks_src(MCBSP_ID(clk_id), MCBSP_CLKS_PAD_SRC);
break; break;

2
drivers/staging/zcache/tmem.c
View File

@ -604,7 +604,7 @@ int tmem_get(struct tmem_pool *pool, struct tmem_oid *oidp, uint32_t index,
struct tmem_obj *obj; struct tmem_obj *obj;
void *pampd; void *pampd;
bool ephemeral = is_ephemeral(pool); bool ephemeral = is_ephemeral(pool);
uint32_t ret = -1; int ret = -1;
struct tmem_hashbucket *hb; struct tmem_hashbucket *hb;
bool free = (get_and_free == 1) || ((get_and_free == 0) && ephemeral); bool free = (get_and_free == 1) || ((get_and_free == 0) && ephemeral);
bool lock_held = false; bool lock_held = false;

8
drivers/staging/zcache/zcache-main.c
View File

@ -1158,7 +1158,7 @@ static void *zcache_pampd_create(char *data, size_t size, bool raw, int eph,
size_t clen; size_t clen;
int ret; int ret;
unsigned long count; unsigned long count;
struct page *page = virt_to_page(data); struct page *page = (struct page *)(data);
struct zcache_client *cli = pool->client; struct zcache_client *cli = pool->client;
uint16_t client_id = get_client_id_from_client(cli); uint16_t client_id = get_client_id_from_client(cli);
unsigned long zv_mean_zsize; unsigned long zv_mean_zsize;
@ -1227,7 +1227,7 @@ static int zcache_pampd_get_data(char *data, size_t *bufsize, bool raw,
int ret = 0; int ret = 0;
BUG_ON(is_ephemeral(pool)); BUG_ON(is_ephemeral(pool));
zv_decompress(virt_to_page(data), pampd); zv_decompress((struct page *)(data), pampd);
return ret; return ret;
} }
@ -1539,7 +1539,7 @@ static int zcache_put_page(int cli_id, int pool_id, struct tmem_oid *oidp,
goto out; goto out;
if (!zcache_freeze && zcache_do_preload(pool) == 0) { if (!zcache_freeze && zcache_do_preload(pool) == 0) {
/* preload does preempt_disable on success */ /* preload does preempt_disable on success */
ret = tmem_put(pool, oidp, index, page_address(page), ret = tmem_put(pool, oidp, index, (char *)(page),
PAGE_SIZE, 0, is_ephemeral(pool)); PAGE_SIZE, 0, is_ephemeral(pool));
if (ret < 0) { if (ret < 0) {
if (is_ephemeral(pool)) if (is_ephemeral(pool))
@ -1572,7 +1572,7 @@ static int zcache_get_page(int cli_id, int pool_id, struct tmem_oid *oidp,
pool = zcache_get_pool_by_id(cli_id, pool_id); pool = zcache_get_pool_by_id(cli_id, pool_id);
if (likely(pool != NULL)) { if (likely(pool != NULL)) {
if (atomic_read(&pool->obj_count) > 0) if (atomic_read(&pool->obj_count) > 0)
ret = tmem_get(pool, oidp, index, page_address(page), ret = tmem_get(pool, oidp, index, (char *)(page),
&size, 0, is_ephemeral(pool)); &size, 0, is_ephemeral(pool));
zcache_put_pool(pool); zcache_put_pool(pool);
} }