diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-11 18:43:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-11 18:43:02 -0500 |
| commit | 7e452baf6b96b5aeba097afd91501d33d390cc97 (patch) | |
| tree | 9b0e062d3677d50d731ffd0fba47423bfdee9253 /arch/x86/kernel/tsc.c | |
| parent | 3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833 (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/message/fusion/mptlan.c
drivers/net/sfc/ethtool.c
net/mac80211/debugfs_sta.c
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 2ef80e301925..424093b157d3 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -55,7 +55,7 @@ u64 native_sched_clock(void) | |||
| 55 | rdtscll(this_offset); | 55 | rdtscll(this_offset); |
| 56 | 56 | ||
| 57 | /* return the value in ns */ | 57 | /* return the value in ns */ |
| 58 | return cycles_2_ns(this_offset); | 58 | return __cycles_2_ns(this_offset); |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | /* We need to define a real function for sched_clock, to override the | 61 | /* We need to define a real function for sched_clock, to override the |