Skip to contentSkip to conversation

ipipe: x86_64: Fix build regression of 747fa81bca

PATCH Applied Jan Kiszka 2 participants 2 messages Mar 13, 2012 x86

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 ipipe: x86_64: Fix build regression of 747fa81bca

Signed-off-by Jan Kiszka <[email protected]>
---
 arch/x86/include/asm/ipipe_64.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/ipipe_64.h +2 -2
index c99830b..0fb92b4 100644
@@ -45,8 +45,8 @@ extern int __ipipe_hrtimer_irq;
 #define __ipipe_hrtimer_freq	__ipipe_cpu_freq
 #define __ipipe_hrclock_freq	__ipipe_cpu_freq
 
-#define ipipe_tsc2ns(t)	(((t) * 1000UL) / (__ipipe_clock_freq / 1000000UL))
-#define ipipe_tsc2us(t)	((t) / (__ipipe_clock_freq / 1000000UL))
+#define ipipe_tsc2ns(t)	(((t) * 1000UL) / (__ipipe_cpu_freq / 1000000UL))
+#define ipipe_tsc2us(t)	((t) / (__ipipe_cpu_freq / 1000000UL))
 
 /* Private interface -- Internal use only */
Signature · 1 line
1.7.3.4
Applied
#1 lore raw
Quoted 10 lines · Jan Kiszka
Signed-off-by Jan Kiszka<[email protected]>
---
  arch/x86/include/asm/ipipe_64.h |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/ipipe_64.h +0 -0
index c99830b..0fb92b4 100644

arch/x86/include/asm/ipipe_64.h extern int __ipipe_hrtimer_irq; · line 52

Quoted 10 lines
arch/x86/include/asm/ipipe_64.h +2 -2
@@ -45,8 +45,8 @@ extern int __ipipe_hrtimer_irq;
  #define __ipipe_hrtimer_freq	__ipipe_cpu_freq
  #define __ipipe_hrclock_freq	__ipipe_cpu_freq
 
-#define ipipe_tsc2ns(t)	(((t) * 1000UL) / (__ipipe_clock_freq / 1000000UL))
-#define ipipe_tsc2us(t)	((t) / (__ipipe_clock_freq / 1000000UL))
+#define ipipe_tsc2ns(t)	(((t) * 1000UL) / (__ipipe_cpu_freq / 1000000UL))
+#define ipipe_tsc2us(t)	((t) / (__ipipe_cpu_freq / 1000000UL))
 
  /* Private interface -- Internal use only */

Merged, thanks.

Signature · 1 line
Philippe.