3 files changed, 43 insertions, 7 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index 9c042f901570..89fe414645e9 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -132,6 +132,14 @@ void __put_task_struct(struct task_struct *tsk)
                 free_task(tsk);
 }
 
+/*
+ * macro override instead of weak attribute alias, to workaround
+ * gcc 4.1.0 and 4.1.1 bugs with weak attribute and empty functions.
+ */
+#ifndef arch_task_cache_init
+#define arch_task_cache_init()
+#endif
+
 void __init fork_init(unsigned long mempages)
 {
 #ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
@@ -144,6 +152,9 @@ void __init fork_init(unsigned long mempages)
                         ARCH_MIN_TASKALIGN, SLAB_PANIC, NULL);
 #endif
 
+        /* do the arch specific task caches init */
+        arch_task_cache_init();
+
         /*
          * The default maximum number of threads is set to a safe
          * value: the thread structures can take up at most half
@@ -163,6 +174,13 @@ void __init fork_init(unsigned long mempages)
                 init_task.signal->rlim[RLIMIT_NPROC];
 }
 
+int __attribute__((weak)) arch_dup_task_struct(struct task_struct *dst,
+                                               struct task_struct *src)
+{
+        *dst = *src;
+        return 0;
+}
+
 static struct task_struct *dup_task_struct(struct task_struct *orig)
 {
         struct task_struct *tsk;
@@ -181,15 +199,15 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
                 return NULL;
         }
 
-        *tsk = *orig;
+        err = arch_dup_task_struct(tsk, orig);
+        if (err)
+                goto out;
+
         tsk->stack = ti;
 
         err = prop_local_init_single(&tsk->dirties);
-        if (err) {
-                free_thread_info(ti);
-                free_task_struct(tsk);
-                return NULL;
-        }
+        if (err)
+                goto out;
 
         setup_thread_stack(tsk, orig);
 
@@ -205,6 +223,11 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
 #endif
         tsk->splice_pipe = NULL;
         return tsk;
+
+out:
+        free_thread_info(ti);
+        free_task_struct(tsk);
+        return NULL;
 }
 
 #ifdef CONFIG_MMU
diff --git a/kernel/sys.c b/kernel/sys.c
index a626116af5db..6a0cc71ee88d 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -67,6 +67,12 @@
 #ifndef SET_ENDIAN
 # define SET_ENDIAN(a,b)        (-EINVAL)
 #endif
+#ifndef GET_TSC_CTL
+# define GET_TSC_CTL(a)         (-EINVAL)
+#endif
+#ifndef SET_TSC_CTL
+# define SET_TSC_CTL(a)         (-EINVAL)
+#endif
 
 /*
  * this is where the system-wide overflow UID and GID are defined, for
@@ -1737,7 +1743,12 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
 #else
                         return -EINVAL;
 #endif
-
+                case PR_GET_TSC:
+                        error = GET_TSC_CTL(arg2);
+                        break;
+                case PR_SET_TSC:
+                        error = SET_TSC_CTL(arg2);
+                        break;
                 default:
                         error = -EINVAL;
                         break;
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index a3fa587c350c..2d6087c7cf98 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -178,6 +178,7 @@ static void change_clocksource(void)
         if (clock == new)
                 return;
 
+        new->cycle_last = 0;
         now = clocksource_read(new);
         nsec =  __get_nsec_offset();
         timespec_add_ns(&xtime, nsec);
@@ -295,6 +296,7 @@ static int timekeeping_resume(struct sys_device *dev)
         timespec_add_ns(&xtime, timekeeping_suspend_nsecs);
         update_xtime_cache(0);
         /* re-base the last cycle value */
+        clock->cycle_last = 0;
         clock->cycle_last = clocksource_read(clock);
         clock->error = 0;
         timekeeping_suspended = 0;