Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 7fccf0326536c1b245b98740d489abb9aab69a12

Authored by WANG Cong
Committed by Linus Torvalds
1 parent f1d8269802
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

kernel/kexec.c: make 'kimage_terminate' void 

Since kimage_terminate() always returns 0, make it void.

Signed-off-by: WANG Cong <wangcong@zeuux.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 6 deletions Side-by-side Diff

... ... @@ -589,14 +589,12 @@
589 589 kimage_free_page_list(&image->unuseable_pages);
590 590  
591 591 }
592   -static int kimage_terminate(struct kimage *image)
  592 +static void kimage_terminate(struct kimage *image)
593 593 {
594 594 if (*image->entry != 0)
595 595 image->entry++;
596 596  
597 597 *image->entry = IND_DONE;
598   -
599   - return 0;
600 598 }
601 599  
602 600 #define for_each_kimage_entry(image, ptr, entry) \
... ... @@ -997,9 +995,7 @@
997 995 if (result)
998 996 goto out;
999 997 }
1000   - result = kimage_terminate(image);
1001   - if (result)
1002   - goto out;
  998 + kimage_terminate(image);
1003 999 }
1004 1000 /* Install the new kernel, and Uninstall the old */
1005 1001 image = xchg(dest_image, image);