| commit | 9bbd055808248a7adc78161472d3301285252361 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 12 16:55:33 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 12 16:55:33 2011 -0700 |
| tree | 9278fd9cddaea9e5932ce6478242927098f6aeb6 | |
| parent | 411f05f123cbd7f8aa1edcae86970755a6e2a9d9 [diff] | |
| parent | 9ddabb055d73c63037878bb9346e52c7f2e07e96 [diff] |
Merge branch 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux * 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux: i2c: pnx: Fix crash due to wrong init of timer->data
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index bc0ac6b..dfd6019 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c
@@ -797,7 +797,7 @@ return string(buf, end, uuid, spec); } -int kptr_restrict = 1; +int kptr_restrict __read_mostly; /* * Show a '%p' thing. A kernel extension is that the '%p' is followed