← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-u8500/trusty

« back to all changes in this revision

Viewing changes to arch/x86/include/asm/tsc.h

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/include/asm/tsc.h
51
51
extern int check_tsc_unstable(void);
52
52
extern unsigned long native_calibrate_tsc(void);
53
53
 
 
54
static inline cycles_t get_cycles_rate(void)
 
55
{
 
56
        if (check_tsc_unstable())
 
57
                return 0;
 
58
        return (cycles_t)tsc_khz * 1000;
 
59
}
 
60
 
 
61
static inline void get_cycles_barrier(void)
 
62
{
 
63
        rdtsc_barrier();
 
64
}
 
65
 
54
66
/*
55
67
 * Boot-time check whether the TSCs are synchronized across
56
68
 * all CPUs/cores:
62
74
extern void save_sched_clock_state(void);
63
75
extern void restore_sched_clock_state(void);
64
76
 
 
77
extern int test_tsc_synchronization(void);
 
78
extern int _tsc_is_sync;
 
79
static inline int tsc_is_sync(void)
 
80
{
 
81
        return _tsc_is_sync;
 
82
}
65
83
#endif /* _ASM_X86_TSC_H */