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

diff --combined arch/xtensa/kernel/setup.c
index 101012bc1ff6d4d99ce408ad8614d1f6f3e2322e,4a8f027ed9ae6f6d1536e2a6e2bd6ebc26e9f41d..946fb8d06c8b48479b021a0f2da7be06961a2d71
--- 1/arch/xtensa/kernel/setup.c
--- 2/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@@ -170,7 -170,8 +170,7 @@@ static int __init parse_tag_fdt(const b
  
  __tagtable(BP_TAG_FDT, parse_tag_fdt);
  
 -void __init early_init_dt_setup_initrd_arch(unsigned long start,
 -              unsigned long end)
 +void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
  {
        initrd_start = (void *)__va(start);
        initrd_end = (void *)__va(end);
@@@ -584,8 -585,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);