android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix few merge issues

Browse Source
This commit is contained in:
Arif Ali 2012-12-27 13:28:42 +00:00
parent ac52e95f27
commit fe9dc4b1d5
7 changed files with 4 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/msm/adreno.h
View File

@ -62,14 +62,6 @@ struct adreno_gpudev;
#define ADRENO_DEFAULT_PWRSCALE_POLICY NULL
#endif
enum adreno_gpurev {
ADRENO_REV_UNKNOWN = 0,
ADRENO_REV_A200 = 200,
ADRENO_REV_A205 = 205,
ADRENO_REV_A220 = 220,
ADRENO_REV_A225 = 225,
};
struct adreno_gpudev;
struct adreno_device {

13
drivers/gpu/msm/kgsl.h
View File

@ -154,19 +154,6 @@ struct kgsl_memdesc {
struct kgsl_pagetable;
struct kgsl_memdesc_ops;
/* shared memory allocation */
struct kgsl_memdesc {
struct kgsl_pagetable *pagetable;
void *hostptr;
unsigned int gpuaddr;
unsigned int physaddr;
unsigned int size;
unsigned int priv;
struct scatterlist *sg;
unsigned int sglen;
struct kgsl_memdesc_ops *ops;
};
struct kgsl_mem_entry {
struct kref refcount;
struct kgsl_memdesc memdesc;

27
drivers/gpu/msm/kgsl_sharedmem.h
View File

@ -139,33 +139,6 @@ kgsl_allocate(struct kgsl_memdesc *memdesc,
return kgsl_sharedmem_page_alloc(memdesc, pagetable, size);
}
static inline int
memdesc_sg_phys(struct kgsl_memdesc *memdesc,
unsigned int physaddr, unsigned int size)
{
struct page *page = phys_to_page(physaddr);
memdesc->sg = kmalloc(sizeof(struct scatterlist) * 1, GFP_KERNEL);
if (memdesc->sg == NULL)
return -ENOMEM;
memdesc->sglen = 1;
sg_init_table(memdesc->sg, 1);
sg_set_page(&memdesc->sg[0], page, size, 0);
return 0;
}
static inline int
kgsl_allocate(struct kgsl_memdesc *memdesc,
struct kgsl_pagetable *pagetable, size_t size)
{
#ifdef CONFIG_MSM_KGSL_MMU
return kgsl_sharedmem_vmalloc(memdesc, pagetable, size);
#else
return kgsl_sharedmem_ebimem(memdesc, pagetable, size);
#endif
}
static inline int
kgsl_allocate_user(struct kgsl_memdesc *memdesc,
struct kgsl_pagetable *pagetable,

3
drivers/net/wireless/bcm4329/dhd_common.c
View File

@ -526,7 +526,8 @@ wl_show_host_event(wl_event_msg_t *event, void *event_data)
{
uint i, status, reason;
bool group = FALSE, flush_txq = FALSE, link = FALSE;
char *auth_str, *event_name;
char *auth_str;
char *event_name;
uchar *buf;
char err_msg[256], eabuf[ETHER_ADDR_STR_LEN];
static struct {uint event; char *event_name;} event_names[] = {

3
drivers/net/wireless/bcm4329/dhd_linux.c
View File

@ -1262,7 +1262,8 @@ dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, void *pktbuf, int numpkt)
struct sk_buff *skb;
uchar *eth;
uint len;
void * data, *pnext, *save_pktbuf;
void * data, *pnext;
void *save_pktbuf;
int i;
dhd_if_t *ifp;
wl_event_msg_t event;

1
drivers/staging/android/binder.c
View File

@ -2791,7 +2791,6 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (binder_context_mgr_node != NULL) {
binder_debug(BINDER_DEBUG_TOP_ERRORS,
"binder: BINDER_SET_CONTEXT_MGR already set\n");
"binder: BINDER_SET_CONTEXT_MGR already set\n");
ret = -EBUSY;
goto err;
}

11
drivers/staging/android/lowmemorykiller.c
View File

@ -87,17 +87,6 @@ static struct notifier_block task_nb = {
};
static void task_free_fn(struct work_struct *work)
{
unsigned long flags;
task_free_unregister(&task_nb);
spin_lock_irqsave(&lowmem_deathpending_lock, flags);
lowmem_deathpending = NULL;
spin_unlock_irqrestore(&lowmem_deathpending_lock, flags);
}
static DECLARE_WORK(task_free_work, task_free_fn);
static int
task_notify_func(struct notifier_block *self, unsigned long val, void *data)
{