diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/fork.c | 2 | ||||
-rw-r--r-- | kernel/irq/chip.c | 3 | ||||
-rw-r--r-- | kernel/ksysfs.c | 12 | ||||
-rw-r--r-- | kernel/module.c | 18 | ||||
-rw-r--r-- | kernel/params.c | 2 | ||||
-rw-r--r-- | kernel/power/disk.c | 14 | ||||
-rw-r--r-- | kernel/power/main.c | 10 | ||||
-rw-r--r-- | kernel/power/power.h | 7 | ||||
-rw-r--r-- | kernel/power/snapshot.c | 11 | ||||
-rw-r--r-- | kernel/power/swap.c | 42 |
10 files changed, 65 insertions, 56 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 6af959c034d8..ffccefb28b6a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -286,6 +286,8 @@ static inline int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) | |||
286 | if (retval) | 286 | if (retval) |
287 | goto out; | 287 | goto out; |
288 | } | 288 | } |
289 | /* a new mm has just been created */ | ||
290 | arch_dup_mmap(oldmm, mm); | ||
289 | retval = 0; | 291 | retval = 0; |
290 | out: | 292 | out: |
291 | up_write(&mm->mmap_sem); | 293 | up_write(&mm->mmap_sem); |
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 0133f4f9e9f0..615ce97c6cfd 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
14 | #include <linux/msi.h> | ||
14 | #include <linux/module.h> | 15 | #include <linux/module.h> |
15 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
16 | #include <linux/kernel_stat.h> | 17 | #include <linux/kernel_stat.h> |
@@ -185,6 +186,8 @@ int set_irq_msi(unsigned int irq, struct msi_desc *entry) | |||
185 | desc = irq_desc + irq; | 186 | desc = irq_desc + irq; |
186 | spin_lock_irqsave(&desc->lock, flags); | 187 | spin_lock_irqsave(&desc->lock, flags); |
187 | desc->msi_desc = entry; | 188 | desc->msi_desc = entry; |
189 | if (entry) | ||
190 | entry->irq = irq; | ||
188 | spin_unlock_irqrestore(&desc->lock, flags); | 191 | spin_unlock_irqrestore(&desc->lock, flags); |
189 | return 0; | 192 | return 0; |
190 | } | 193 | } |
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c index e0ffe4ab0917..559deca5ed15 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c | |||
@@ -24,18 +24,18 @@ static struct subsys_attribute _name##_attr = \ | |||
24 | 24 | ||
25 | #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) | 25 | #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) |
26 | /* current uevent sequence number */ | 26 | /* current uevent sequence number */ |
27 | static ssize_t uevent_seqnum_show(struct subsystem *subsys, char *page) | 27 | static ssize_t uevent_seqnum_show(struct kset *kset, char *page) |
28 | { | 28 | { |
29 | return sprintf(page, "%llu\n", (unsigned long long)uevent_seqnum); | 29 | return sprintf(page, "%llu\n", (unsigned long long)uevent_seqnum); |
30 | } | 30 | } |
31 | KERNEL_ATTR_RO(uevent_seqnum); | 31 | KERNEL_ATTR_RO(uevent_seqnum); |
32 | 32 | ||
33 | /* uevent helper program, used during early boo */ | 33 | /* uevent helper program, used during early boo */ |
34 | static ssize_t uevent_helper_show(struct subsystem *subsys, char *page) | 34 | static ssize_t uevent_helper_show(struct kset *kset, char *page) |
35 | { | 35 | { |
36 | return sprintf(page, "%s\n", uevent_helper); | 36 | return sprintf(page, "%s\n", uevent_helper); |
37 | } | 37 | } |
38 | static ssize_t uevent_helper_store(struct subsystem *subsys, const char *page, size_t count) | 38 | static ssize_t uevent_helper_store(struct kset *kset, const char *page, size_t count) |
39 | { | 39 | { |
40 | if (count+1 > UEVENT_HELPER_PATH_LEN) | 40 | if (count+1 > UEVENT_HELPER_PATH_LEN) |
41 | return -ENOENT; | 41 | return -ENOENT; |
@@ -49,13 +49,13 @@ KERNEL_ATTR_RW(uevent_helper); | |||
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | #ifdef CONFIG_KEXEC | 51 | #ifdef CONFIG_KEXEC |
52 | static ssize_t kexec_loaded_show(struct subsystem *subsys, char *page) | 52 | static ssize_t kexec_loaded_show(struct kset *kset, char *page) |
53 | { | 53 | { |
54 | return sprintf(page, "%d\n", !!kexec_image); | 54 | return sprintf(page, "%d\n", !!kexec_image); |
55 | } | 55 | } |
56 | KERNEL_ATTR_RO(kexec_loaded); | 56 | KERNEL_ATTR_RO(kexec_loaded); |
57 | 57 | ||
58 | static ssize_t kexec_crash_loaded_show(struct subsystem *subsys, char *page) | 58 | static ssize_t kexec_crash_loaded_show(struct kset *kset, char *page) |
59 | { | 59 | { |
60 | return sprintf(page, "%d\n", !!kexec_crash_image); | 60 | return sprintf(page, "%d\n", !!kexec_crash_image); |
61 | } | 61 | } |
@@ -85,7 +85,7 @@ static int __init ksysfs_init(void) | |||
85 | { | 85 | { |
86 | int error = subsystem_register(&kernel_subsys); | 86 | int error = subsystem_register(&kernel_subsys); |
87 | if (!error) | 87 | if (!error) |
88 | error = sysfs_create_group(&kernel_subsys.kset.kobj, | 88 | error = sysfs_create_group(&kernel_subsys.kobj, |
89 | &kernel_attr_group); | 89 | &kernel_attr_group); |
90 | 90 | ||
91 | return error; | 91 | return error; |
diff --git a/kernel/module.c b/kernel/module.c index 9da5af668a20..1eb8ca565ba0 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -45,6 +45,8 @@ | |||
45 | #include <asm/cacheflush.h> | 45 | #include <asm/cacheflush.h> |
46 | #include <linux/license.h> | 46 | #include <linux/license.h> |
47 | 47 | ||
48 | extern int module_sysfs_initialized; | ||
49 | |||
48 | #if 0 | 50 | #if 0 |
49 | #define DEBUGP printk | 51 | #define DEBUGP printk |
50 | #else | 52 | #else |
@@ -346,10 +348,10 @@ static void *percpu_modalloc(unsigned long size, unsigned long align, | |||
346 | unsigned int i; | 348 | unsigned int i; |
347 | void *ptr; | 349 | void *ptr; |
348 | 350 | ||
349 | if (align > SMP_CACHE_BYTES) { | 351 | if (align > PAGE_SIZE) { |
350 | printk(KERN_WARNING "%s: per-cpu alignment %li > %i\n", | 352 | printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n", |
351 | name, align, SMP_CACHE_BYTES); | 353 | name, align, PAGE_SIZE); |
352 | align = SMP_CACHE_BYTES; | 354 | align = PAGE_SIZE; |
353 | } | 355 | } |
354 | 356 | ||
355 | ptr = __per_cpu_start; | 357 | ptr = __per_cpu_start; |
@@ -430,7 +432,7 @@ static int percpu_modinit(void) | |||
430 | pcpu_size = kmalloc(sizeof(pcpu_size[0]) * pcpu_num_allocated, | 432 | pcpu_size = kmalloc(sizeof(pcpu_size[0]) * pcpu_num_allocated, |
431 | GFP_KERNEL); | 433 | GFP_KERNEL); |
432 | /* Static in-kernel percpu data (used). */ | 434 | /* Static in-kernel percpu data (used). */ |
433 | pcpu_size[0] = -ALIGN(__per_cpu_end-__per_cpu_start, SMP_CACHE_BYTES); | 435 | pcpu_size[0] = -(__per_cpu_end-__per_cpu_start); |
434 | /* Free room. */ | 436 | /* Free room. */ |
435 | pcpu_size[1] = PERCPU_ENOUGH_ROOM + pcpu_size[0]; | 437 | pcpu_size[1] = PERCPU_ENOUGH_ROOM + pcpu_size[0]; |
436 | if (pcpu_size[1] < 0) { | 438 | if (pcpu_size[1] < 0) { |
@@ -1117,8 +1119,8 @@ int mod_sysfs_init(struct module *mod) | |||
1117 | { | 1119 | { |
1118 | int err; | 1120 | int err; |
1119 | 1121 | ||
1120 | if (!module_subsys.kset.subsys) { | 1122 | if (!module_sysfs_initialized) { |
1121 | printk(KERN_ERR "%s: module_subsys not initialized\n", | 1123 | printk(KERN_ERR "%s: module sysfs not initialized\n", |
1122 | mod->name); | 1124 | mod->name); |
1123 | err = -EINVAL; | 1125 | err = -EINVAL; |
1124 | goto out; | 1126 | goto out; |
@@ -2385,7 +2387,7 @@ void module_add_driver(struct module *mod, struct device_driver *drv) | |||
2385 | struct kobject *mkobj; | 2387 | struct kobject *mkobj; |
2386 | 2388 | ||
2387 | /* Lookup built-in module entry in /sys/modules */ | 2389 | /* Lookup built-in module entry in /sys/modules */ |
2388 | mkobj = kset_find_obj(&module_subsys.kset, drv->mod_name); | 2390 | mkobj = kset_find_obj(&module_subsys, drv->mod_name); |
2389 | if (mkobj) { | 2391 | if (mkobj) { |
2390 | mk = container_of(mkobj, struct module_kobject, kobj); | 2392 | mk = container_of(mkobj, struct module_kobject, kobj); |
2391 | /* remember our module structure */ | 2393 | /* remember our module structure */ |
diff --git a/kernel/params.c b/kernel/params.c index 1fc4ac746cd8..312172320b4c 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
@@ -691,6 +691,7 @@ static struct kset_uevent_ops module_uevent_ops = { | |||
691 | }; | 691 | }; |
692 | 692 | ||
693 | decl_subsys(module, &module_ktype, &module_uevent_ops); | 693 | decl_subsys(module, &module_ktype, &module_uevent_ops); |
694 | int module_sysfs_initialized; | ||
694 | 695 | ||
695 | static struct kobj_type module_ktype = { | 696 | static struct kobj_type module_ktype = { |
696 | .sysfs_ops = &module_sysfs_ops, | 697 | .sysfs_ops = &module_sysfs_ops, |
@@ -709,6 +710,7 @@ static int __init param_sysfs_init(void) | |||
709 | __FILE__, __LINE__, ret); | 710 | __FILE__, __LINE__, ret); |
710 | return ret; | 711 | return ret; |
711 | } | 712 | } |
713 | module_sysfs_initialized = 1; | ||
712 | 714 | ||
713 | param_sysfs_builtin(); | 715 | param_sysfs_builtin(); |
714 | 716 | ||
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 02e4fb69111a..8df51c23bba4 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c | |||
@@ -322,13 +322,13 @@ static const char * const pm_disk_modes[] = { | |||
322 | * supports it (as determined from pm_ops->pm_disk_mode). | 322 | * supports it (as determined from pm_ops->pm_disk_mode). |
323 | */ | 323 | */ |
324 | 324 | ||
325 | static ssize_t disk_show(struct subsystem * subsys, char * buf) | 325 | static ssize_t disk_show(struct kset *kset, char *buf) |
326 | { | 326 | { |
327 | return sprintf(buf, "%s\n", pm_disk_modes[pm_disk_mode]); | 327 | return sprintf(buf, "%s\n", pm_disk_modes[pm_disk_mode]); |
328 | } | 328 | } |
329 | 329 | ||
330 | 330 | ||
331 | static ssize_t disk_store(struct subsystem * s, const char * buf, size_t n) | 331 | static ssize_t disk_store(struct kset *kset, const char *buf, size_t n) |
332 | { | 332 | { |
333 | int error = 0; | 333 | int error = 0; |
334 | int i; | 334 | int i; |
@@ -373,13 +373,13 @@ static ssize_t disk_store(struct subsystem * s, const char * buf, size_t n) | |||
373 | 373 | ||
374 | power_attr(disk); | 374 | power_attr(disk); |
375 | 375 | ||
376 | static ssize_t resume_show(struct subsystem * subsys, char *buf) | 376 | static ssize_t resume_show(struct kset *kset, char *buf) |
377 | { | 377 | { |
378 | return sprintf(buf,"%d:%d\n", MAJOR(swsusp_resume_device), | 378 | return sprintf(buf,"%d:%d\n", MAJOR(swsusp_resume_device), |
379 | MINOR(swsusp_resume_device)); | 379 | MINOR(swsusp_resume_device)); |
380 | } | 380 | } |
381 | 381 | ||
382 | static ssize_t resume_store(struct subsystem *subsys, const char *buf, size_t n) | 382 | static ssize_t resume_store(struct kset *kset, const char *buf, size_t n) |
383 | { | 383 | { |
384 | unsigned int maj, min; | 384 | unsigned int maj, min; |
385 | dev_t res; | 385 | dev_t res; |
@@ -405,12 +405,12 @@ static ssize_t resume_store(struct subsystem *subsys, const char *buf, size_t n) | |||
405 | 405 | ||
406 | power_attr(resume); | 406 | power_attr(resume); |
407 | 407 | ||
408 | static ssize_t image_size_show(struct subsystem * subsys, char *buf) | 408 | static ssize_t image_size_show(struct kset *kset, char *buf) |
409 | { | 409 | { |
410 | return sprintf(buf, "%lu\n", image_size); | 410 | return sprintf(buf, "%lu\n", image_size); |
411 | } | 411 | } |
412 | 412 | ||
413 | static ssize_t image_size_store(struct subsystem * subsys, const char * buf, size_t n) | 413 | static ssize_t image_size_store(struct kset *kset, const char *buf, size_t n) |
414 | { | 414 | { |
415 | unsigned long size; | 415 | unsigned long size; |
416 | 416 | ||
@@ -439,7 +439,7 @@ static struct attribute_group attr_group = { | |||
439 | 439 | ||
440 | static int __init pm_disk_init(void) | 440 | static int __init pm_disk_init(void) |
441 | { | 441 | { |
442 | return sysfs_create_group(&power_subsys.kset.kobj,&attr_group); | 442 | return sysfs_create_group(&power_subsys.kobj, &attr_group); |
443 | } | 443 | } |
444 | 444 | ||
445 | core_initcall(pm_disk_init); | 445 | core_initcall(pm_disk_init); |
diff --git a/kernel/power/main.c b/kernel/power/main.c index 72419a3b1beb..b21c2a56f960 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -285,7 +285,7 @@ decl_subsys(power,NULL,NULL); | |||
285 | * proper enumerated value, and initiates a suspend transition. | 285 | * proper enumerated value, and initiates a suspend transition. |
286 | */ | 286 | */ |
287 | 287 | ||
288 | static ssize_t state_show(struct subsystem * subsys, char * buf) | 288 | static ssize_t state_show(struct kset *kset, char *buf) |
289 | { | 289 | { |
290 | int i; | 290 | int i; |
291 | char * s = buf; | 291 | char * s = buf; |
@@ -298,7 +298,7 @@ static ssize_t state_show(struct subsystem * subsys, char * buf) | |||
298 | return (s - buf); | 298 | return (s - buf); |
299 | } | 299 | } |
300 | 300 | ||
301 | static ssize_t state_store(struct subsystem * subsys, const char * buf, size_t n) | 301 | static ssize_t state_store(struct kset *kset, const char *buf, size_t n) |
302 | { | 302 | { |
303 | suspend_state_t state = PM_SUSPEND_STANDBY; | 303 | suspend_state_t state = PM_SUSPEND_STANDBY; |
304 | const char * const *s; | 304 | const char * const *s; |
@@ -325,13 +325,13 @@ power_attr(state); | |||
325 | #ifdef CONFIG_PM_TRACE | 325 | #ifdef CONFIG_PM_TRACE |
326 | int pm_trace_enabled; | 326 | int pm_trace_enabled; |
327 | 327 | ||
328 | static ssize_t pm_trace_show(struct subsystem * subsys, char * buf) | 328 | static ssize_t pm_trace_show(struct kset *kset, char *buf) |
329 | { | 329 | { |
330 | return sprintf(buf, "%d\n", pm_trace_enabled); | 330 | return sprintf(buf, "%d\n", pm_trace_enabled); |
331 | } | 331 | } |
332 | 332 | ||
333 | static ssize_t | 333 | static ssize_t |
334 | pm_trace_store(struct subsystem * subsys, const char * buf, size_t n) | 334 | pm_trace_store(struct kset *kset, const char *buf, size_t n) |
335 | { | 335 | { |
336 | int val; | 336 | int val; |
337 | 337 | ||
@@ -365,7 +365,7 @@ static int __init pm_init(void) | |||
365 | { | 365 | { |
366 | int error = subsystem_register(&power_subsys); | 366 | int error = subsystem_register(&power_subsys); |
367 | if (!error) | 367 | if (!error) |
368 | error = sysfs_create_group(&power_subsys.kset.kobj,&attr_group); | 368 | error = sysfs_create_group(&power_subsys.kobj,&attr_group); |
369 | return error; | 369 | return error; |
370 | } | 370 | } |
371 | 371 | ||
diff --git a/kernel/power/power.h b/kernel/power/power.h index eb461b816bf4..33bd94ceba32 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h | |||
@@ -23,6 +23,8 @@ static inline int pm_suspend_disk(void) | |||
23 | } | 23 | } |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | extern int pfn_is_nosave(unsigned long); | ||
27 | |||
26 | extern struct mutex pm_mutex; | 28 | extern struct mutex pm_mutex; |
27 | 29 | ||
28 | #define power_attr(_name) \ | 30 | #define power_attr(_name) \ |
@@ -35,10 +37,7 @@ static struct subsys_attribute _name##_attr = { \ | |||
35 | .store = _name##_store, \ | 37 | .store = _name##_store, \ |
36 | } | 38 | } |
37 | 39 | ||
38 | extern struct subsystem power_subsys; | 40 | extern struct kset power_subsys; |
39 | |||
40 | /* References to section boundaries */ | ||
41 | extern const void __nosave_begin, __nosave_end; | ||
42 | 41 | ||
43 | /* Preferred image size in bytes (default 500 MB) */ | 42 | /* Preferred image size in bytes (default 500 MB) */ |
44 | extern unsigned long image_size; | 43 | extern unsigned long image_size; |
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index fc53ad068128..704c25a3ffec 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c | |||
@@ -651,17 +651,6 @@ static inline unsigned int count_highmem_pages(void) { return 0; } | |||
651 | #endif /* CONFIG_HIGHMEM */ | 651 | #endif /* CONFIG_HIGHMEM */ |
652 | 652 | ||
653 | /** | 653 | /** |
654 | * pfn_is_nosave - check if given pfn is in the 'nosave' section | ||
655 | */ | ||
656 | |||
657 | static inline int pfn_is_nosave(unsigned long pfn) | ||
658 | { | ||
659 | unsigned long nosave_begin_pfn = __pa(&__nosave_begin) >> PAGE_SHIFT; | ||
660 | unsigned long nosave_end_pfn = PAGE_ALIGN(__pa(&__nosave_end)) >> PAGE_SHIFT; | ||
661 | return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn); | ||
662 | } | ||
663 | |||
664 | /** | ||
665 | * saveable - Determine whether a non-highmem page should be included in | 654 | * saveable - Determine whether a non-highmem page should be included in |
666 | * the suspend image. | 655 | * the suspend image. |
667 | * | 656 | * |
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 3581f8f86acd..b18c155cbb60 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c | |||
@@ -33,12 +33,14 @@ extern char resume_file[]; | |||
33 | 33 | ||
34 | #define SWSUSP_SIG "S1SUSPEND" | 34 | #define SWSUSP_SIG "S1SUSPEND" |
35 | 35 | ||
36 | static struct swsusp_header { | 36 | struct swsusp_header { |
37 | char reserved[PAGE_SIZE - 20 - sizeof(sector_t)]; | 37 | char reserved[PAGE_SIZE - 20 - sizeof(sector_t)]; |
38 | sector_t image; | 38 | sector_t image; |
39 | char orig_sig[10]; | 39 | char orig_sig[10]; |
40 | char sig[10]; | 40 | char sig[10]; |
41 | } __attribute__((packed, aligned(PAGE_SIZE))) swsusp_header; | 41 | } __attribute__((packed)); |
42 | |||
43 | static struct swsusp_header *swsusp_header; | ||
42 | 44 | ||
43 | /* | 45 | /* |
44 | * General things | 46 | * General things |
@@ -141,14 +143,14 @@ static int mark_swapfiles(sector_t start) | |||
141 | { | 143 | { |
142 | int error; | 144 | int error; |
143 | 145 | ||
144 | bio_read_page(swsusp_resume_block, &swsusp_header, NULL); | 146 | bio_read_page(swsusp_resume_block, swsusp_header, NULL); |
145 | if (!memcmp("SWAP-SPACE",swsusp_header.sig, 10) || | 147 | if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) || |
146 | !memcmp("SWAPSPACE2",swsusp_header.sig, 10)) { | 148 | !memcmp("SWAPSPACE2",swsusp_header->sig, 10)) { |
147 | memcpy(swsusp_header.orig_sig,swsusp_header.sig, 10); | 149 | memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10); |
148 | memcpy(swsusp_header.sig,SWSUSP_SIG, 10); | 150 | memcpy(swsusp_header->sig,SWSUSP_SIG, 10); |
149 | swsusp_header.image = start; | 151 | swsusp_header->image = start; |
150 | error = bio_write_page(swsusp_resume_block, | 152 | error = bio_write_page(swsusp_resume_block, |
151 | &swsusp_header, NULL); | 153 | swsusp_header, NULL); |
152 | } else { | 154 | } else { |
153 | printk(KERN_ERR "swsusp: Swap header not found!\n"); | 155 | printk(KERN_ERR "swsusp: Swap header not found!\n"); |
154 | error = -ENODEV; | 156 | error = -ENODEV; |
@@ -564,7 +566,7 @@ int swsusp_read(void) | |||
564 | if (error < PAGE_SIZE) | 566 | if (error < PAGE_SIZE) |
565 | return error < 0 ? error : -EFAULT; | 567 | return error < 0 ? error : -EFAULT; |
566 | header = (struct swsusp_info *)data_of(snapshot); | 568 | header = (struct swsusp_info *)data_of(snapshot); |
567 | error = get_swap_reader(&handle, swsusp_header.image); | 569 | error = get_swap_reader(&handle, swsusp_header->image); |
568 | if (!error) | 570 | if (!error) |
569 | error = swap_read_page(&handle, header, NULL); | 571 | error = swap_read_page(&handle, header, NULL); |
570 | if (!error) | 572 | if (!error) |
@@ -591,17 +593,17 @@ int swsusp_check(void) | |||
591 | resume_bdev = open_by_devnum(swsusp_resume_device, FMODE_READ); | 593 | resume_bdev = open_by_devnum(swsusp_resume_device, FMODE_READ); |
592 | if (!IS_ERR(resume_bdev)) { | 594 | if (!IS_ERR(resume_bdev)) { |
593 | set_blocksize(resume_bdev, PAGE_SIZE); | 595 | set_blocksize(resume_bdev, PAGE_SIZE); |
594 | memset(&swsusp_header, 0, sizeof(swsusp_header)); | 596 | memset(swsusp_header, 0, sizeof(PAGE_SIZE)); |
595 | error = bio_read_page(swsusp_resume_block, | 597 | error = bio_read_page(swsusp_resume_block, |
596 | &swsusp_header, NULL); | 598 | swsusp_header, NULL); |
597 | if (error) | 599 | if (error) |
598 | return error; | 600 | return error; |
599 | 601 | ||
600 | if (!memcmp(SWSUSP_SIG, swsusp_header.sig, 10)) { | 602 | if (!memcmp(SWSUSP_SIG, swsusp_header->sig, 10)) { |
601 | memcpy(swsusp_header.sig, swsusp_header.orig_sig, 10); | 603 | memcpy(swsusp_header->sig, swsusp_header->orig_sig, 10); |
602 | /* Reset swap signature now */ | 604 | /* Reset swap signature now */ |
603 | error = bio_write_page(swsusp_resume_block, | 605 | error = bio_write_page(swsusp_resume_block, |
604 | &swsusp_header, NULL); | 606 | swsusp_header, NULL); |
605 | } else { | 607 | } else { |
606 | return -EINVAL; | 608 | return -EINVAL; |
607 | } | 609 | } |
@@ -632,3 +634,13 @@ void swsusp_close(void) | |||
632 | 634 | ||
633 | blkdev_put(resume_bdev); | 635 | blkdev_put(resume_bdev); |
634 | } | 636 | } |
637 | |||
638 | static int swsusp_header_init(void) | ||
639 | { | ||
640 | swsusp_header = (struct swsusp_header*) __get_free_page(GFP_KERNEL); | ||
641 | if (!swsusp_header) | ||
642 | panic("Could not allocate memory for swsusp_header\n"); | ||
643 | return 0; | ||
644 | } | ||
645 | |||
646 | core_initcall(swsusp_header_init); | ||