|
@@ -2144,13 +2144,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
|
|
|
nr_swap_pages += p->pages;
|
|
|
total_swap_pages += p->pages;
|
|
|
|
|
|
- printk(KERN_INFO "Adding %uk swap on %s. "
|
|
|
- "Priority:%d extents:%d across:%lluk %s%s\n",
|
|
|
- p->pages<<(PAGE_SHIFT-10), name, p->prio,
|
|
|
- nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10),
|
|
|
- (p->flags & SWP_SOLIDSTATE) ? "SS" : "",
|
|
|
- (p->flags & SWP_DISCARDABLE) ? "D" : "");
|
|
|
-
|
|
|
/* insert swap space into swap_list: */
|
|
|
prev = -1;
|
|
|
for (i = swap_list.head; i >= 0; i = swap_info[i]->next) {
|
|
@@ -2164,6 +2157,14 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
|
|
|
else
|
|
|
swap_info[prev]->next = p->type;
|
|
|
spin_unlock(&swap_lock);
|
|
|
+
|
|
|
+ printk(KERN_INFO "Adding %uk swap on %s. "
|
|
|
+ "Priority:%d extents:%d across:%lluk %s%s\n",
|
|
|
+ p->pages<<(PAGE_SHIFT-10), name, p->prio,
|
|
|
+ nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10),
|
|
|
+ (p->flags & SWP_SOLIDSTATE) ? "SS" : "",
|
|
|
+ (p->flags & SWP_DISCARDABLE) ? "D" : "");
|
|
|
+
|
|
|
mutex_unlock(&swapon_mutex);
|
|
|
atomic_inc(&proc_poll_event);
|
|
|
wake_up_interruptible(&proc_poll_wait);
|