github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 11:03:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'work-next' into staging-next

Browse Source
This commit is contained in:
Greg Kroah-Hartman 2012-02-29 15:24:04 -08:00
commit ca923ef927
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/ozwpan/ozeventdef.h
View File

@ -37,7 +37,7 @@ struct oz_event {
unsigned ctx4;
};
#define OZ_EVT_LIST_SZ 256
#define OZ_EVT_LIST_SZ 64
struct oz_evtlist {
int count;
int missed;

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

@ -701,7 +701,6 @@ static struct zv_hdr *zv_create(struct zs_pool *pool, uint32_t pool_id,
u32 size = clen + sizeof(struct zv_hdr);
int chunks = (size + (CHUNK_SIZE - 1)) >> CHUNK_SHIFT;
void *handle = NULL;
char *buf;
BUG_ON(!irqs_disabled());
BUG_ON(chunks >= NCHUNKS);
@ -710,14 +709,13 @@ static struct zv_hdr *zv_create(struct zs_pool *pool, uint32_t pool_id,
goto out;
atomic_inc(&zv_curr_dist_counts[chunks]);
atomic_inc(&zv_cumul_dist_counts[chunks]);
zv = (struct zv_hdr *)((char *)cdata - sizeof(*zv));
zv = zs_map_object(pool, handle);
zv->index = index;
zv->oid = *oid;
zv->pool_id = pool_id;
zv->size = clen;
SET_SENTINEL(zv, ZVH);
buf = zs_map_object(pool, handle);
memcpy(buf, zv, clen + sizeof(*zv));
memcpy((char *)zv + sizeof(struct zv_hdr), cdata, clen);
zs_unmap_object(pool, handle);
out:
return handle;
@ -1170,14 +1168,14 @@ static atomic_t zcache_curr_pers_pampd_count = ATOMIC_INIT(0);
static unsigned long zcache_curr_pers_pampd_count_max;
/* forward reference */
static int zcache_compress(struct page *from, void **out_va, size_t *out_len);
static int zcache_compress(struct page *from, void **out_va, unsigned *out_len);
static void *zcache_pampd_create(char *data, size_t size, bool raw, int eph,
struct tmem_pool *pool, struct tmem_oid *oid,
uint32_t index)
{
void *pampd = NULL, *cdata;
size_t clen;
unsigned clen;
int ret;
unsigned long count;
struct page *page = (struct page *)(data);
@ -1326,7 +1324,7 @@ static struct tmem_pamops zcache_pamops = {
static DEFINE_PER_CPU(unsigned char *, zcache_dstmem);
#define ZCACHE_DSTMEM_ORDER 1
static int zcache_compress(struct page *from, void **out_va, size_t *out_len)
static int zcache_compress(struct page *from, void **out_va, unsigned *out_len)
{
int ret = 0;
unsigned char *dmem = __get_cpu_var(zcache_dstmem);
@ -1339,7 +1337,7 @@ static int zcache_compress(struct page *from, void **out_va, size_t *out_len)
from_va = kmap_atomic(from, KM_USER0);
mb();
ret = zcache_comp_op(ZCACHE_COMPOP_COMPRESS, from_va, PAGE_SIZE, dmem,
(unsigned int *)out_len);
out_len);
BUG_ON(ret);
*out_va = dmem;
kunmap_atomic(from_va, KM_USER0);