diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /include/asm-s390 | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/system.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h index b2e65e8bf812..6a89dbb03c1e 100644 --- a/include/asm-s390/system.h +++ b/include/asm-s390/system.h | |||
| @@ -118,6 +118,8 @@ static inline void sched_cacheflush(void) | |||
| 118 | extern void account_vtime(struct task_struct *); | 118 | extern void account_vtime(struct task_struct *); |
| 119 | extern void account_tick_vtime(struct task_struct *); | 119 | extern void account_tick_vtime(struct task_struct *); |
| 120 | extern void account_system_vtime(struct task_struct *); | 120 | extern void account_system_vtime(struct task_struct *); |
| 121 | #else | ||
| 122 | #define account_vtime(x) do { /* empty */ } while (0) | ||
| 121 | #endif | 123 | #endif |
| 122 | 124 | ||
| 123 | #define finish_arch_switch(prev) do { \ | 125 | #define finish_arch_switch(prev) do { \ |