6 files changed, 111 insertions, 10 deletions

diff --git a/init/Kconfig b/init/Kconfig
index b1091d7542..05a75c4f5c 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -174,7 +174,7 @@ config AUDIT
 
 config AUDITSYSCALL
         bool "Enable system-call auditing support"
-        depends on AUDIT && (X86 || PPC || PPC64 || ARCH_S390 || IA64 || UML)
+        depends on AUDIT && (X86 || PPC || PPC64 || ARCH_S390 || IA64 || UML || SPARC64)
         default y if SECURITY_SELINUX
         help
           Enable low-overhead system-call auditing infrastructure that
@@ -231,7 +231,7 @@ config CPUSETS
         bool "Cpuset support"
         depends on SMP
         help
-          This options will let you create and manage CPUSET's which
+          This option will let you create and manage CPUSETs which
           allow dynamically partitioning a system into sets of CPUs and
           Memory Nodes and assigning tasks to run only within those sets.
           This is primarily useful on large SMP or NUMA systems.
diff --git a/init/calibrate.c b/init/calibrate.c
index c698e04a3d..d206c7548f 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -8,6 +8,8 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 
+#include <asm/timex.h>
+
 static unsigned long preset_lpj;
 static int __init lpj_setup(char *str)
 {
@@ -17,6 +19,92 @@ static int __init lpj_setup(char *str)
 
 __setup("lpj=", lpj_setup);
 
+#ifdef ARCH_HAS_READ_CURRENT_TIMER
+
+/* This routine uses the read_current_timer() routine and gets the
+ * loops per jiffy directly, instead of guessing it using delay().
+ * Also, this code tries to handle non-maskable asynchronous events
+ * (like SMIs)
+ */
+#define DELAY_CALIBRATION_TICKS                 ((HZ < 100) ? 1 : (HZ/100))
+#define MAX_DIRECT_CALIBRATION_RETRIES          5
+
+static unsigned long __devinit calibrate_delay_direct(void)
+{
+        unsigned long pre_start, start, post_start;
+        unsigned long pre_end, end, post_end;
+        unsigned long start_jiffies;
+        unsigned long tsc_rate_min, tsc_rate_max;
+        unsigned long good_tsc_sum = 0;
+        unsigned long good_tsc_count = 0;
+        int i;
+
+        if (read_current_timer(&pre_start) < 0 )
+                return 0;
+
+        /*
+         * A simple loop like
+         *      while ( jiffies < start_jiffies+1)
+         *              start = read_current_timer();
+         * will not do. As we don't really know whether jiffy switch
+         * happened first or timer_value was read first. And some asynchronous
+         * event can happen between these two events introducing errors in lpj.
+         *
+         * So, we do
+         * 1. pre_start <- When we are sure that jiffy switch hasn't happened
+         * 2. check jiffy switch
+         * 3. start <- timer value before or after jiffy switch
+         * 4. post_start <- When we are sure that jiffy switch has happened
+         *
+         * Note, we don't know anything about order of 2 and 3.
+         * Now, by looking at post_start and pre_start difference, we can
+         * check whether any asynchronous event happened or not
+         */
+
+        for (i = 0; i < MAX_DIRECT_CALIBRATION_RETRIES; i++) {
+                pre_start = 0;
+                read_current_timer(&start);
+                start_jiffies = jiffies;
+                while (jiffies <= (start_jiffies + 1)) {
+                        pre_start = start;
+                        read_current_timer(&start);
+                }
+                read_current_timer(&post_start);
+
+                pre_end = 0;
+                end = post_start;
+                while (jiffies <=
+                       (start_jiffies + 1 + DELAY_CALIBRATION_TICKS)) {
+                        pre_end = end;
+                        read_current_timer(&end);
+                }
+                read_current_timer(&post_end);
+
+                tsc_rate_max = (post_end - pre_start) / DELAY_CALIBRATION_TICKS;
+                tsc_rate_min = (pre_end - post_start) / DELAY_CALIBRATION_TICKS;
+
+                /*
+                 * If the upper limit and lower limit of the tsc_rate is
+                 * >= 12.5% apart, redo calibration.
+                 */
+                if (pre_start != 0 && pre_end != 0 &&
+                    (tsc_rate_max - tsc_rate_min) < (tsc_rate_max >> 3)) {
+                        good_tsc_count++;
+                        good_tsc_sum += tsc_rate_max;
+                }
+        }
+
+        if (good_tsc_count)
+                return (good_tsc_sum/good_tsc_count);
+
+        printk(KERN_WARNING "calibrate_delay_direct() failed to get a good "
+               "estimate for loops_per_jiffy.\nProbably due to long platform interrupts. Consider using \"lpj=\" boot option.\n");
+        return 0;
+}
+#else
+static unsigned long __devinit calibrate_delay_direct(void) {return 0;}
+#endif
+
 /*
  * This is the number of bits of precision for the loops_per_jiffy.  Each
  * bit takes on average 1.5/HZ seconds.  This (like the original) is a little
@@ -35,6 +123,12 @@ void __devinit calibrate_delay(void)
                         "%lu.%02lu BogoMIPS preset\n",
                         loops_per_jiffy/(500000/HZ),
                         (loops_per_jiffy/(5000/HZ)) % 100);
+        } else if ((loops_per_jiffy = calibrate_delay_direct()) != 0) {
+                printk("Calibrating delay using timer specific routine.. ");
+                printk("%lu.%02lu BogoMIPS (lpj=%lu)\n",
+                        loops_per_jiffy/(500000/HZ),
+                        (loops_per_jiffy/(5000/HZ)) % 100,
+                        loops_per_jiffy);
         } else {
                 loops_per_jiffy = (1<<12);
 
diff --git a/init/do_mounts.c b/init/do_mounts.c
index b7570c074d..4e11a9aaf1 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -7,6 +7,7 @@
 #include <linux/root_dev.h>
 #include <linux/security.h>
 #include <linux/delay.h>
+#include <linux/mount.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
@@ -25,8 +26,6 @@ static char __initdata saved_root_name[64];
 /* this is initialized in init/main.c */
 dev_t ROOT_DEV;
 
-EXPORT_SYMBOL(ROOT_DEV);
-
 static int __init load_ramdisk(char *str)
 {
         rd_doload = simple_strtol(str,NULL,0) & 3;
diff --git a/init/do_mounts.h b/init/do_mounts.h
index de92bee4f3..e0a7ac9649 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -9,7 +9,6 @@
 #include <linux/major.h>
 #include <linux/root_dev.h>
 
-dev_t name_to_dev_t(char *name);
 void  change_floppy(char *fmt, ...);
 void  mount_block_root(char *name, int flags);
 void  mount_root(void);
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 07e7d31f2d..a05cabd0fd 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -41,7 +41,7 @@ static int __init do_linuxrc(void * shell)
 static void __init handle_initrd(void)
 {
         int error;
-        int i, pid;
+        int pid;
 
         real_root_dev = new_encode_dev(ROOT_DEV);
         create_dev("/dev/root.old", Root_RAM0, NULL);
@@ -58,7 +58,7 @@ static void __init handle_initrd(void)
 
         pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
         if (pid > 0) {
-                while (pid != sys_wait4(-1, &i, 0, NULL))
+                while (pid != sys_wait4(-1, NULL, 0, NULL))
                         yield();
         }
 
@@ -86,7 +86,10 @@ static void __init handle_initrd(void)
                 printk("okay\n");
         else {
                 int fd = sys_open("/dev/root.old", O_RDWR, 0);
-                printk("failed\n");
+                if (error == -ENOENT)
+                        printk("/initrd does not exist. Ignored.\n");
+                else
+                        printk("failed\n");
                 printk(KERN_NOTICE "Unmounting old root\n");
                 sys_umount("/old", MNT_DETACH);
                 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
diff --git a/init/main.c b/init/main.c
index d324801729..c9c311cf17 100644
--- a/init/main.c
+++ b/init/main.c
@@ -51,6 +51,7 @@
 #include <asm/io.h>
 #include <asm/bugs.h>
 #include <asm/setup.h>
+#include <asm/sections.h>
 
 /*
  * This is one of the first .c files built. Error out early
@@ -323,8 +324,6 @@ static void __init setup_per_cpu_areas(void)
 {
         unsigned long size, i;
         char *ptr;
-        /* Created by linker magic */
-        extern char __per_cpu_start[], __per_cpu_end[];
 
         /* Copy section for each CPU (we discard the original) */
         size = ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES);
@@ -383,6 +382,13 @@ static void noinline rest_init(void)
         numa_default_policy();
         unlock_kernel();
         preempt_enable_no_resched();
+
+        /*
+         * The boot idle thread must execute schedule()
+         * at least one to get things moving:
+         */
+        schedule();
+
         cpu_idle();
 }