bring kexec.c to version 2.6.39

diff --git a/kexec.c b/kexec.c
index 7cdf7c26553c25558df1509503741e35a31acd13..2f98d3207955dec48d115dba339fde794ce54df6 100644 (file)
--- a/kexec.c
+++ b/kexec.c
@@ -153,15 +153,17 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
        /* Initialize the list of destination pages */
        INIT_LIST_HEAD(&image->dest_pages);
 
        /* Initialize the list of destination pages */
        INIT_LIST_HEAD(&image->dest_pages);
 

-       /* Initialize the list of unuseable pages */
+       /* Initialize the list of unusable pages */

        INIT_LIST_HEAD(&image->unuseable_pages);
 
        /* Read in the segments */
        image->nr_segments = nr_segments;
        segment_bytes = nr_segments * sizeof(*segments);
        result = copy_from_user(image->segment, segments, segment_bytes);
        INIT_LIST_HEAD(&image->unuseable_pages);
 
        /* Read in the segments */
        image->nr_segments = nr_segments;
        segment_bytes = nr_segments * sizeof(*segments);
        result = copy_from_user(image->segment, segments, segment_bytes);

-       if (result)
+       if (result) {
+               result = -EFAULT;

                goto out;
                goto out;

+       }

 
        /*
         * Verify we have good destination addresses.  The caller is
 
        /*
         * Verify we have good destination addresses.  The caller is


@@ -170,7 +172,7 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
         * just verifies it is an address we can use.
         *
         * Since the kernel does everything in page size chunks ensure
         * just verifies it is an address we can use.
         *
         * Since the kernel does everything in page size chunks ensure

-        * the destination addreses are page aligned.  Too many
+        * the destination addresses are page aligned.  Too many

         * special cases crop of when we don't do this.  The most
         * insidious is getting overlapping destination addresses
         * simply because addresses are changed to page size
         * special cases crop of when we don't do this.  The most
         * insidious is getting overlapping destination addresses
         * simply because addresses are changed to page size


@@ -461,7 +463,7 @@ static struct page *kimage_alloc_normal_control_pages(struct kimage *image,
        /* Deal with the destination pages I have inadvertently allocated.
         *
         * Ideally I would convert multi-page allocations into single
        /* Deal with the destination pages I have inadvertently allocated.
         *
         * Ideally I would convert multi-page allocations into single

-        * page allocations, and add everyting to image->dest_pages.
+        * page allocations, and add everything to image->dest_pages.

         *
         * For now it is simpler to just free the pages.
         */
         *
         * For now it is simpler to just free the pages.
         */


@@ -609,7 +611,7 @@ static void kimage_free_extra_pages(struct kimage *image)
        /* Walk through and free any extra destination pages I may have */
        kimage_free_page_list(&image->dest_pages);
 
        /* Walk through and free any extra destination pages I may have */
        kimage_free_page_list(&image->dest_pages);
 

-       /* Walk through and free any unuseable pages I have cached */
+       /* Walk through and free any unusable pages I have cached */

        kimage_free_page_list(&image->unuseable_pages);
 
 }
        kimage_free_page_list(&image->unuseable_pages);
 
 }


@@ -823,7 +825,7 @@ static int kimage_load_normal_segment(struct kimage *image,
 
                ptr = kmap(page);
                /* Start with a clear page */
 
                ptr = kmap(page);
                /* Start with a clear page */

-               memset(ptr, 0, PAGE_SIZE);
+               clear_page(ptr);

                ptr += maddr & ~PAGE_MASK;
                mchunk = PAGE_SIZE - (maddr & ~PAGE_MASK);
                if (mchunk > mbytes)
                ptr += maddr & ~PAGE_MASK;
                mchunk = PAGE_SIZE - (maddr & ~PAGE_MASK);
                if (mchunk > mbytes)


@@ -836,7 +838,7 @@ static int kimage_load_normal_segment(struct kimage *image,
                result = copy_from_user(ptr, buf, uchunk);
                kunmap(page);
                if (result) {
                result = copy_from_user(ptr, buf, uchunk);
                kunmap(page);
                if (result) {

-                       result = (result < 0) ? result : -EIO;
+                       result = -EFAULT;

                        goto out;
                }
                ubytes -= uchunk;
                        goto out;
                }
                ubytes -= uchunk;


@@ -891,7 +893,7 @@ static int kimage_load_crash_segment(struct kimage *image,
                kexec_flush_icache_page(page);
                kunmap(page);
                if (result) {
                kexec_flush_icache_page(page);
                kunmap(page);
                if (result) {

-                       result = (result < 0) ? result : -EIO;
+                       result = -EFAULT;

                        goto out;
                }
                ubytes -= uchunk;
                        goto out;
                }
                ubytes -= uchunk;


@@ -1400,8 +1402,7 @@ int kernel_kexec(void)
                if (error)
                        goto Enable_cpus;
                local_irq_disable();
                if (error)
                        goto Enable_cpus;
                local_irq_disable();

-               /* Suspend system devices */
-               error = sysdev_suspend(PMSG_FREEZE);
+               error = syscore_suspend();

                if (error)
                        goto Enable_irqs;
        } else
                if (error)
                        goto Enable_irqs;
        } else


@@ -1416,7 +1417,7 @@ int kernel_kexec(void)
 
 #ifdef CONFIG_KEXEC_JUMP
        if (kexec_image->preserve_context) {
 
 #ifdef CONFIG_KEXEC_JUMP
        if (kexec_image->preserve_context) {

-               sysdev_resume();
+               syscore_resume();

  Enable_irqs:
                local_irq_enable();
  Enable_cpus:
  Enable_irqs:
                local_irq_enable();
  Enable_cpus: