Commit 8a470649 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] misc sparse cleanups

 - missing ; between default: and } in sun4setup.c
 - cast of pointer to unsigned long long instead of unsigned long in
   x86_64 signal.c
 - missed annotations for ioctl structure in sparc64 openpromio.h
   (should've been in the same patch as the rest of drivers/sbus/*
   annotations)
 - 0->NULL in list.h and pmdisk.c
parent 644d66dd
......@@ -69,6 +69,7 @@ void __init sun4setup(void)
sun4_esp_physaddr=SUN4_400_ESP_PHYSADDR;
break;
default:
;
}
}
......@@ -242,7 +242,7 @@ static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
if (me->used_math) {
fp = get_stack(ka, regs, sizeof(struct _fpstate));
frame = (void __user *)round_down((u64)fp - sizeof(struct rt_sigframe), 16) - 8;
frame = (void __user *)round_down((unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8;
if (!access_ok(VERIFY_WRITE, fp, sizeof(struct _fpstate))) {
goto give_sigsegv;
......
......@@ -52,9 +52,9 @@ struct opiocdesc
{
int op_nodeid; /* PROM Node ID (value-result) */
int op_namelen; /* Length of op_name. */
char *op_name; /* Pointer to the property name. */
char __user *op_name; /* Pointer to the property name. */
int op_buflen; /* Length of op_buf (value-result) */
char *op_buf; /* Pointer to buffer. */
char __user *op_buf; /* Pointer to buffer. */
};
#define OPIOCGET _IOWR('O', 1, struct opiocdesc)
......
......@@ -626,7 +626,7 @@ static inline void hlist_add_after(struct hlist_node *n,
pos = pos->next)
#define hlist_for_each_safe(pos, n, head) \
for (pos = (head)->first; n = pos ? pos->next : 0, pos; \
for (pos = (head)->first; n = pos ? pos->next : NULL, pos; \
pos = n)
/**
......
......@@ -953,7 +953,7 @@ static const char * __init sanity_check(void)
return "machine";
if(pmdisk_info.cpus != num_online_cpus())
return "number of cpus";
return 0;
return NULL;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment