diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 10:57:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 10:57:48 -0700 |
| commit | 67002151403350b497c1efc8d36450974dfca023 (patch) | |
| tree | 187e98f0c588c38b54baeee04b491e288e9470be /arch/xtensa/kernel/setup.c | |
| parent | 9bf12df31f282e845b3dfaac1e5d5376a041da22 (diff) | |
| parent | 8872366df396444d7655287c79ed182d8f47cba6 (diff) | |
| download | op-kernel-dev-67002151403350b497c1efc8d36450974dfca023.zip op-kernel-dev-67002151403350b497c1efc8d36450974dfca023.tar.gz | |
Merge tag 'xtensa-next-20130912' of git://github.com/czankel/xtensa-linux
Pull Xtensa updates from Chris Zankel.
* tag 'xtensa-next-20130912' of git://github.com/czankel/xtensa-linux:
xtensa: Fix broken allmodconfig build
xtensa: remove CCOUNT_PER_JIFFY
xtensa: fix !CONFIG_XTENSA_CALIBRATE_CCOUNT build failure
xtensa: don't use echo -e needlessly
xtensa: new fast_alloca handler
xtensa: keep a3 and excsave1 on entry to exception handlers
xtensa: enable kernel preemption
xtensa: check thread flags atomically on return from user exception
Diffstat (limited to 'arch/xtensa/kernel/setup.c')
| -rw-r--r-- | arch/xtensa/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 101012b..946fb8d 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -584,8 +584,8 @@ c_show(struct seq_file *f, void *slot) "bogomips\t: %lu.%02lu\n", XCHAL_BUILD_UNIQUE_ID, XCHAL_HAVE_BE ? "big" : "little", - CCOUNT_PER_JIFFY/(1000000/HZ), - (CCOUNT_PER_JIFFY/(10000/HZ)) % 100, + ccount_freq/1000000, + (ccount_freq/10000) % 100, loops_per_jiffy/(500000/HZ), (loops_per_jiffy/(5000/HZ)) % 100); |
