diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /arch/s390/kernel/time.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/s390/kernel/time.c')
| -rw-r--r-- | arch/s390/kernel/time.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 3bbac1293be4..76a5dd1b4ce9 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
| @@ -744,7 +744,6 @@ static void etr_adjust_time(unsigned long long clock, unsigned long long delay) | |||
| 744 | } | 744 | } |
| 745 | } | 745 | } |
| 746 | 746 | ||
| 747 | #ifdef CONFIG_SMP | ||
| 748 | static void etr_sync_cpu_start(void *dummy) | 747 | static void etr_sync_cpu_start(void *dummy) |
| 749 | { | 748 | { |
| 750 | int *in_sync = dummy; | 749 | int *in_sync = dummy; |
| @@ -777,7 +776,6 @@ static void etr_sync_cpu_start(void *dummy) | |||
| 777 | static void etr_sync_cpu_end(void *dummy) | 776 | static void etr_sync_cpu_end(void *dummy) |
| 778 | { | 777 | { |
| 779 | } | 778 | } |
| 780 | #endif /* CONFIG_SMP */ | ||
| 781 | 779 | ||
| 782 | /* | 780 | /* |
| 783 | * Sync the TOD clock using the port refered to by aibp. This port | 781 | * Sync the TOD clock using the port refered to by aibp. This port |