提交 314b6a4d 编写于 作者: A Alexey Dobriyan 提交者: Linus Torvalds

[PATCH] kexec: fix sparse warnings

Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 97afa0a2
...@@ -241,7 +241,7 @@ static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry, ...@@ -241,7 +241,7 @@ static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry,
static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry, static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry,
unsigned long nr_segments, unsigned long nr_segments,
struct kexec_segment *segments) struct kexec_segment __user *segments)
{ {
int result; int result;
struct kimage *image; struct kimage *image;
...@@ -650,7 +650,7 @@ static kimage_entry_t *kimage_dst_used(struct kimage *image, ...@@ -650,7 +650,7 @@ static kimage_entry_t *kimage_dst_used(struct kimage *image,
} }
} }
return 0; return NULL;
} }
static struct page *kimage_alloc_page(struct kimage *image, static struct page *kimage_alloc_page(struct kimage *image,
...@@ -696,7 +696,7 @@ static struct page *kimage_alloc_page(struct kimage *image, ...@@ -696,7 +696,7 @@ static struct page *kimage_alloc_page(struct kimage *image,
/* Allocate a page, if we run out of memory give up */ /* Allocate a page, if we run out of memory give up */
page = kimage_alloc_pages(gfp_mask, 0); page = kimage_alloc_pages(gfp_mask, 0);
if (!page) if (!page)
return 0; return NULL;
/* If the page cannot be used file it away */ /* If the page cannot be used file it away */
if (page_to_pfn(page) > if (page_to_pfn(page) >
(KEXEC_SOURCE_MEMORY_LIMIT >> PAGE_SHIFT)) { (KEXEC_SOURCE_MEMORY_LIMIT >> PAGE_SHIFT)) {
...@@ -754,7 +754,7 @@ static int kimage_load_normal_segment(struct kimage *image, ...@@ -754,7 +754,7 @@ static int kimage_load_normal_segment(struct kimage *image,
unsigned long maddr; unsigned long maddr;
unsigned long ubytes, mbytes; unsigned long ubytes, mbytes;
int result; int result;
unsigned char *buf; unsigned char __user *buf;
result = 0; result = 0;
buf = segment->buf; buf = segment->buf;
...@@ -818,7 +818,7 @@ static int kimage_load_crash_segment(struct kimage *image, ...@@ -818,7 +818,7 @@ static int kimage_load_crash_segment(struct kimage *image,
unsigned long maddr; unsigned long maddr;
unsigned long ubytes, mbytes; unsigned long ubytes, mbytes;
int result; int result;
unsigned char *buf; unsigned char __user *buf;
result = 0; result = 0;
buf = segment->buf; buf = segment->buf;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册