Merge /scratch/Ksrc/linux-git/

2 files changed, 4 insertions, 3 deletions

diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
index 10cc096c0ade..31f65c8a4c24 100644
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
@@ -110,14 +110,13 @@ static int query_current_values_with_pending_wait(struct powernow_k8_data *data)
         u32 lo, hi;
         u32 i = 0;
 
-        lo = MSR_S_LO_CHANGE_PENDING;
-        while (lo & MSR_S_LO_CHANGE_PENDING) {
+        do {
                 if (i++ > 0x1000000) {
                         printk(KERN_ERR PFX "detected change pending stuck\n");
                         return 1;
                 }
                 rdmsr(MSR_FIDVID_STATUS, lo, hi);
-        }
+        } while (lo & MSR_S_LO_CHANGE_PENDING);
 
         data->currvid = hi & MSR_S_HI_CURRENT_VID;
         data->currfid = lo & MSR_S_LO_CURRENT_FID;
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index d9492058aaf3..e3f362e8af5b 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -917,6 +917,8 @@ asmlinkage int sys_get_thread_area(struct user_desc __user *u_info)
         if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
                 return -EINVAL;
 
+        memset(&info, 0, sizeof(info));
+
         desc = current->thread.tls_array + idx - GDT_ENTRY_TLS_MIN;
 
         info.entry_number = idx;