diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 00:31:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 00:31:24 -0500 |
| commit | 05f6ece6f37f987e9de643f6f76e8fb5d5b9e014 (patch) | |
| tree | 5244e85d0dfb2619b0af4bc80a2c99dd579f79a5 /arch/parisc/kernel/process.c | |
| parent | 35d138ae22f826f95f0f8d0285947582ccf4508f (diff) | |
| parent | 58b6c58caef7a34eab7ec887288fa495696653e7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'arch/parisc/kernel/process.c')
| -rw-r--r-- | arch/parisc/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index fee4f1f09adc..4eb70a40ec7e 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | #include <asm/uaccess.h> | 54 | #include <asm/uaccess.h> |
| 55 | #include <asm/unwind.h> | 55 | #include <asm/unwind.h> |
| 56 | 56 | ||
| 57 | static int hlt_counter; | 57 | static int hlt_counter __read_mostly; |
| 58 | 58 | ||
| 59 | /* | 59 | /* |
| 60 | * Power off function, if any | 60 | * Power off function, if any |