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 branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] xen: fix xen_get_eflags.
[IA64] ia64/pv_ops/pv_cpu_ops: fix _IA64_REG_IP case.
[IA64] remove duplicate include iommu.h
[IA64] use mprintk instead of printk, in ia64_mca_modify_original_stack
[IA64] Rationalize kernel mode alignment checking

Linus Torvalds 906430a9 ba721d31

+19 -6
unified split
+1 -1
arch/ia64/include/asm/intrinsics.h
··· 226 226 /************************************************/ 227 227 #define ia64_ssm IA64_INTRINSIC_MACRO(ssm) 228 228 #define ia64_rsm IA64_INTRINSIC_MACRO(rsm) 229 - #define ia64_getreg IA64_INTRINSIC_API(getreg) 229 + #define ia64_getreg IA64_INTRINSIC_MACRO(getreg) 230 230 #define ia64_setreg IA64_INTRINSIC_API(setreg) 231 231 #define ia64_set_rr IA64_INTRINSIC_API(set_rr) 232 232 #define ia64_get_rr IA64_INTRINSIC_API(get_rr)
+13
arch/ia64/include/asm/paravirt_privop.h
··· 78 78 ia64_native_rsm(mask); \ 79 79 } while (0) 80 80 81 + /* returned ip value should be the one in the caller, 82 + * not in __paravirt_getreg() */ 83 + #define paravirt_getreg(reg) \ 84 + ({ \ 85 + unsigned long res; \ 86 + BUILD_BUG_ON(!__builtin_constant_p(reg)); \ 87 + if ((reg) == _IA64_REG_IP) \ 88 + res = ia64_native_getreg(_IA64_REG_IP); \ 89 + else \ 90 + res = pv_cpu_ops.getreg(reg); \ 91 + res; \ 92 + }) 93 + 81 94 /****************************************************************************** 82 95 * replacement of hand written assembly codes. 83 96 */
+1
arch/ia64/kernel/entry.S
··· 499 499 END(prefetch_stack) 500 500 501 501 GLOBAL_ENTRY(kernel_execve) 502 + rum psr.ac 502 503 mov r15=__NR_execve // put syscall number in place 503 504 break __BREAK_SYSCALL 504 505 br.ret.sptk.many rp
+1 -1
arch/ia64/kernel/head.S
··· 260 260 * Switch into virtual mode: 261 261 */ 262 262 movl r16=(IA64_PSR_IT|IA64_PSR_IC|IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_DFH|IA64_PSR_BN \ 263 - |IA64_PSR_DI) 263 + |IA64_PSR_DI|IA64_PSR_AC) 264 264 ;; 265 265 mov cr.ipsr=r16 266 266 movl r17=1f
+1 -1
arch/ia64/kernel/mca.c
··· 1139 1139 return previous_current; 1140 1140 1141 1141 no_mod: 1142 - printk(KERN_INFO "cpu %d, %s %s, original stack not modified\n", 1142 + mprintk(KERN_INFO "cpu %d, %s %s, original stack not modified\n", 1143 1143 smp_processor_id(), type, msg); 1144 1144 return previous_current; 1145 1145 }
+1 -1
arch/ia64/kernel/paravirt.c
··· 130 130 unsigned long res = -1; 131 131 switch (regnum) { 132 132 CASE_GET_REG(GP); 133 - CASE_GET_REG(IP); 133 + /*CASE_GET_REG(IP);*/ /* returned ip value shouldn't be constant */ 134 134 CASE_GET_REG(PSR); 135 135 CASE_GET_REG(TP); 136 136 CASE_GET_REG(SP);
-1
arch/ia64/kernel/pci-dma.c
··· 19 19 #include <linux/kernel.h> 20 20 21 21 #include <asm/page.h> 22 - #include <asm/iommu.h> 23 22 24 23 dma_addr_t bad_dma_address __read_mostly; 25 24 EXPORT_SYMBOL(bad_dma_address);
+1 -1
arch/ia64/xen/hypercall.S
··· 58 58 __HCALL2(xen_set_kr, HYPERPRIVOP_SET_KR) 59 59 60 60 #ifdef CONFIG_IA32_SUPPORT 61 - __HCALL1(xen_get_eflag, HYPERPRIVOP_GET_EFLAG) 61 + __HCALL0(xen_get_eflag, HYPERPRIVOP_GET_EFLAG) 62 62 __HCALL1(xen_set_eflag, HYPERPRIVOP_SET_EFLAG) // refer SDM vol1 3.1.8 63 63 #endif /* CONFIG_IA32_SUPPORT */ 64 64