Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 886bb7e9c3ed0bb3e4a2b1f336d8c6a6e5a4b782

Authored by Hugh Dickins
Committed by Linus Torvalds
1 parent 22c6f8fdb3
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

swapfile: remove surplus whitespace 

Remove trailing whitespace from swapfile.c, and odd swap_show() alignment.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

... ... @@ -92,7 +92,7 @@
92 92 unsigned long offset, last_in_cluster;
93 93 int latency_ration = LATENCY_LIMIT;
94 94  
95   - /*
  95 + /*
96 96 * We try to cluster swap pages by allocating them sequentially
97 97 * in swap. Once we've allocated SWAPFILE_CLUSTER pages this
98 98 * way, however, we resort to first-free allocation, starting
... ... @@ -269,7 +269,7 @@
269 269 printk(KERN_ERR "swap_free: %s%08lx\n", Bad_file, entry.val);
270 270 out:
271 271 return NULL;
272   -}
  272 +}
273 273  
274 274 static int swap_entry_free(struct swap_info_struct *p, unsigned long offset)
275 275 {
276 276  
... ... @@ -736,10 +736,10 @@
736 736 break;
737 737 }
738 738  
739   - /*
  739 + /*
740 740 * Get a page for the entry, using the existing swap
741 741 * cache page if there is one. Otherwise, get a clean
742   - * page and read the swap into it.
  742 + * page and read the swap into it.
743 743 */
744 744 swap_map = &si->swap_map[i];
745 745 entry = swp_entry(type, i);
... ... @@ -1202,7 +1202,7 @@
1202 1202 char * pathname;
1203 1203 int i, type, prev;
1204 1204 int err;
1205   -
  1205 +
1206 1206 if (!capable(CAP_SYS_ADMIN))
1207 1207 return -EPERM;
1208 1208  
1209 1209  
... ... @@ -1395,12 +1395,12 @@
1395 1395 file = ptr->swap_file;
1396 1396 len = seq_path(swap, &file->f_path, " \t\n\\");
1397 1397 seq_printf(swap, "%*s%s\t%u\t%u\t%d\n",
1398   - len < 40 ? 40 - len : 1, " ",
1399   - S_ISBLK(file->f_path.dentry->d_inode->i_mode) ?
  1398 + len < 40 ? 40 - len : 1, " ",
  1399 + S_ISBLK(file->f_path.dentry->d_inode->i_mode) ?
1400 1400 "partition" : "file\t",
1401   - ptr->pages << (PAGE_SHIFT - 10),
1402   - ptr->inuse_pages << (PAGE_SHIFT - 10),
1403   - ptr->prio);
  1401 + ptr->pages << (PAGE_SHIFT - 10),
  1402 + ptr->inuse_pages << (PAGE_SHIFT - 10),
  1403 + ptr->prio);
1404 1404 return 0;
1405 1405 }
1406 1406  
... ... @@ -1565,7 +1565,7 @@
1565 1565 error = -EINVAL;
1566 1566 goto bad_swap;
1567 1567 }
1568   -
  1568 +
1569 1569 switch (swap_header_version) {
1570 1570 case 1:
1571 1571 printk(KERN_ERR "version 0 swap is no longer supported. "