Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 715be1fce0d964aca15618b24f6f415f3cbd03c8

Authored by Jan Engelhardt
Committed by Linus Torvalds
1 parent af5e617143
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

procfs: use more apprioriate types when dumping /proc/N/stat 

- use int fpr priority and nice, since task_nice()/task_prio() return that

- field 24: get_mm_rss() returns unsigned long

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
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 2 deletions Side-by-side Diff

... ... @@ -370,7 +370,7 @@
370 370 struct pid *pid, struct task_struct *task, int whole)
371 371 {
372 372 unsigned long vsize, eip, esp, wchan = ~0UL;
373   - long priority, nice;
  373 + int priority, nice;
374 374 int tty_pgrp = -1, tty_nr = 0;
375 375 sigset_t sigign, sigcatch;
376 376 char state;
... ... @@ -492,7 +492,7 @@
492 492 seq_put_decimal_ull(m, ' ', 0);
493 493 seq_put_decimal_ull(m, ' ', start_time);
494 494 seq_put_decimal_ull(m, ' ', vsize);
495   - seq_put_decimal_ll(m, ' ', mm ? get_mm_rss(mm) : 0);
  495 + seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
496 496 seq_put_decimal_ull(m, ' ', rsslim);
497 497 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
498 498 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);