tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Properly truncate pt_regs framepointer in perf callback.
arch/sparc/kernel: Use set_cpus_allowed_ptr
sparc: Fix use of uid16_t and gid16_t in asm/stat.h

Linus Torvalds c45140a9 de329820

+13 -13
unified split
+2 -2
arch/sparc/include/asm/stat.h
··· 53 53 ino_t st_ino; 54 54 mode_t st_mode; 55 55 short st_nlink; 56 - uid16_t st_uid; 57 - gid16_t st_gid; 56 + unsigned short st_uid; 57 + unsigned short st_gid; 58 58 unsigned short st_rdev; 59 59 off_t st_size; 60 60 time_t st_atime;
+1 -1
arch/sparc/kernel/perf_event.c
··· 1337 1337 callchain_store(entry, PERF_CONTEXT_USER); 1338 1338 callchain_store(entry, regs->tpc); 1339 1339 1340 - ufp = regs->u_regs[UREG_I6]; 1340 + ufp = regs->u_regs[UREG_I6] & 0xffffffffUL; 1341 1341 do { 1342 1342 struct sparc_stackf32 *usf, sf; 1343 1343 unsigned long pc;
+2 -2
arch/sparc/kernel/sysfs.c
··· 107 107 unsigned long ret; 108 108 109 109 /* should return -EINVAL to userspace */ 110 - if (set_cpus_allowed(current, cpumask_of_cpu(cpu))) 110 + if (set_cpus_allowed_ptr(current, cpumask_of(cpu))) 111 111 return 0; 112 112 113 113 ret = func(arg); 114 114 115 - set_cpus_allowed(current, old_affinity); 115 + set_cpus_allowed_ptr(current, &old_affinity); 116 116 117 117 return ret; 118 118 }
+4 -4
arch/sparc/kernel/us2e_cpufreq.c
··· 238 238 return 0; 239 239 240 240 cpus_allowed = current->cpus_allowed; 241 - set_cpus_allowed(current, cpumask_of_cpu(cpu)); 241 + set_cpus_allowed_ptr(current, cpumask_of(cpu)); 242 242 243 243 clock_tick = sparc64_get_clock_tick(cpu) / 1000; 244 244 estar = read_hbreg(HBIRD_ESTAR_MODE_ADDR); 245 245 246 - set_cpus_allowed(current, cpus_allowed); 246 + set_cpus_allowed_ptr(current, &cpus_allowed); 247 247 248 248 return clock_tick / estar_to_divisor(estar); 249 249 } ··· 259 259 return; 260 260 261 261 cpus_allowed = current->cpus_allowed; 262 - set_cpus_allowed(current, cpumask_of_cpu(cpu)); 262 + set_cpus_allowed_ptr(current, cpumask_of(cpu)); 263 263 264 264 new_freq = clock_tick = sparc64_get_clock_tick(cpu) / 1000; 265 265 new_bits = index_to_estar_mode(index); ··· 281 281 282 282 cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); 283 283 284 - set_cpus_allowed(current, cpus_allowed); 284 + set_cpus_allowed_ptr(current, &cpus_allowed); 285 285 } 286 286 287 287 static int us2e_freq_target(struct cpufreq_policy *policy,
+4 -4
arch/sparc/kernel/us3_cpufreq.c
··· 86 86 return 0; 87 87 88 88 cpus_allowed = current->cpus_allowed; 89 - set_cpus_allowed(current, cpumask_of_cpu(cpu)); 89 + set_cpus_allowed_ptr(current, cpumask_of(cpu)); 90 90 91 91 reg = read_safari_cfg(); 92 92 ret = get_current_freq(cpu, reg); 93 93 94 - set_cpus_allowed(current, cpus_allowed); 94 + set_cpus_allowed_ptr(current, &cpus_allowed); 95 95 96 96 return ret; 97 97 } ··· 106 106 return; 107 107 108 108 cpus_allowed = current->cpus_allowed; 109 - set_cpus_allowed(current, cpumask_of_cpu(cpu)); 109 + set_cpus_allowed_ptr(current, cpumask_of(cpu)); 110 110 111 111 new_freq = sparc64_get_clock_tick(cpu) / 1000; 112 112 switch (index) { ··· 140 140 141 141 cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); 142 142 143 - set_cpus_allowed(current, cpus_allowed); 143 + set_cpus_allowed_ptr(current, &cpus_allowed); 144 144 } 145 145 146 146 static int us3_freq_target(struct cpufreq_policy *policy,