diff options
-rw-r--r-- | Documentation/arm/Booting | 2 | ||||
-rw-r--r-- | Documentation/arm/README | 2 | ||||
-rw-r--r-- | Documentation/arm/Setup | 2 | ||||
-rw-r--r-- | include/linux/timer.h | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/arm/Booting b/Documentation/arm/Booting index fad566bb02fc..76850295af8f 100644 --- a/Documentation/arm/Booting +++ b/Documentation/arm/Booting | |||
@@ -118,7 +118,7 @@ to store page tables. The recommended placement is 32KiB into RAM. | |||
118 | 118 | ||
119 | In either case, the following conditions must be met: | 119 | In either case, the following conditions must be met: |
120 | 120 | ||
121 | - Quiesce all DMA capable devicess so that memory does not get | 121 | - Quiesce all DMA capable devices so that memory does not get |
122 | corrupted by bogus network packets or disk data. This will save | 122 | corrupted by bogus network packets or disk data. This will save |
123 | you many hours of debug. | 123 | you many hours of debug. |
124 | 124 | ||
diff --git a/Documentation/arm/README b/Documentation/arm/README index 5ed6f3530b86..9b9c8226fdc4 100644 --- a/Documentation/arm/README +++ b/Documentation/arm/README | |||
@@ -89,7 +89,7 @@ Modules | |||
89 | Although modularisation is supported (and required for the FP emulator), | 89 | Although modularisation is supported (and required for the FP emulator), |
90 | each module on an ARM2/ARM250/ARM3 machine when is loaded will take | 90 | each module on an ARM2/ARM250/ARM3 machine when is loaded will take |
91 | memory up to the next 32k boundary due to the size of the pages. | 91 | memory up to the next 32k boundary due to the size of the pages. |
92 | Therefore, modularisation on these machines really worth it? | 92 | Therefore, is modularisation on these machines really worth it? |
93 | 93 | ||
94 | However, ARM6 and up machines allow modules to take multiples of 4k, and | 94 | However, ARM6 and up machines allow modules to take multiples of 4k, and |
95 | as such Acorn RiscPCs and other architectures using these processors can | 95 | as such Acorn RiscPCs and other architectures using these processors can |
diff --git a/Documentation/arm/Setup b/Documentation/arm/Setup index 0abd0720d7ed..0cb1e64bde80 100644 --- a/Documentation/arm/Setup +++ b/Documentation/arm/Setup | |||
@@ -58,7 +58,7 @@ below: | |||
58 | video_y | 58 | video_y |
59 | 59 | ||
60 | This describes the character position of cursor on VGA console, and | 60 | This describes the character position of cursor on VGA console, and |
61 | is otherwise unused. (should not used for other console types, and | 61 | is otherwise unused. (should not be used for other console types, and |
62 | should not be used for other purposes). | 62 | should not be used for other purposes). |
63 | 63 | ||
64 | memc_control_reg | 64 | memc_control_reg |
diff --git a/include/linux/timer.h b/include/linux/timer.h index 9b9877fd2505..ee5a09e806e8 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h | |||
@@ -69,13 +69,13 @@ extern unsigned long next_timer_interrupt(void); | |||
69 | * @timer: the timer to be added | 69 | * @timer: the timer to be added |
70 | * | 70 | * |
71 | * The kernel will do a ->function(->data) callback from the | 71 | * The kernel will do a ->function(->data) callback from the |
72 | * timer interrupt at the ->expired point in the future. The | 72 | * timer interrupt at the ->expires point in the future. The |
73 | * current time is 'jiffies'. | 73 | * current time is 'jiffies'. |
74 | * | 74 | * |
75 | * The timer's ->expired, ->function (and if the handler uses it, ->data) | 75 | * The timer's ->expires, ->function (and if the handler uses it, ->data) |
76 | * fields must be set prior calling this function. | 76 | * fields must be set prior calling this function. |
77 | * | 77 | * |
78 | * Timers with an ->expired field in the past will be executed in the next | 78 | * Timers with an ->expires field in the past will be executed in the next |
79 | * timer tick. | 79 | * timer tick. |
80 | */ | 80 | */ |
81 | static inline void add_timer(struct timer_list *timer) | 81 | static inline void add_timer(struct timer_list *timer) |