[Xenomai-git] Philippe Gerum : cobalt/arm: upgrade I-pipe support
Module: xenomai-3
Branch: next
Commit: 38f49c12a0bf14e71aaea97f2ff04990d64f1d59
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=38f49c12a0bf14e71aaea97f2ff04990d64f1d59
Author: Philippe Gerum r...@xenomai.org
Date: Thu Feb 5 09:04:43 2015 +0100
cobalt/arm: upgrade I-pipe support
---
...-arm-6.patch = ipipe-core-3.14.28-arm-8.patch} | 305
1 file changed, 180 insertions(+), 125 deletions(-)
diff --git a/kernel/cobalt/arch/arm/patches/ipipe-core-3.14.17-arm-6.patch
b/kernel/cobalt/arch/arm/patches/ipipe-core-3.14.28-arm-8.patch
similarity index 98%
rename from kernel/cobalt/arch/arm/patches/ipipe-core-3.14.17-arm-6.patch
rename to kernel/cobalt/arch/arm/patches/ipipe-core-3.14.28-arm-8.patch
index dac5295..6ed50be 100644
--- a/kernel/cobalt/arch/arm/patches/ipipe-core-3.14.17-arm-6.patch
+++ b/kernel/cobalt/arch/arm/patches/ipipe-core-3.14.28-arm-8.patch
@@ -88,10 +88,10 @@ index bd245d3..65f2238 100644
extern unsigned long free_mem_ptr;
extern unsigned long free_mem_end_ptr;
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
-index 066b034..9558765 100644
+index 8017cde..f6b8d68 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
-@@ -1263,6 +1263,15 @@ memdump:mov r12, r0
+@@ -1275,6 +1275,15 @@ memdump:mov r12, r0
mov pc, r10
#endif
@@ -855,7 +855,7 @@ index 0704e0c..862504a 100644
}
diff --git a/arch/arm/include/asm/assembler.h
b/arch/arm/include/asm/assembler.h
-index 5c22851..102adcb 100644
+index 5c22851..e285269 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -95,6 +95,18 @@
@@ -877,7 +877,7 @@ index 5c22851..102adcb 100644
#else
.macro disable_irq_notrace
msr cpsr_c, #PSR_I_BIT | SVC_MODE
-@@ -103,10 +115,22 @@
+@@ -103,6 +115,18 @@
.macro enable_irq_notrace
msr cpsr_c, #SVC_MODE
.endm
@@ -896,20 +896,6 @@ index 5c22851..102adcb 100644
#endif
.macro asm_trace_hardirqs_off
--#if defined(CONFIG_TRACE_IRQFLAGS)
-+#if defined(CONFIG_TRACE_IRQFLAGS) !defined(CONFIG_IPIPE)
- stmdb sp!, {r0-r3, ip, lr}
- bl trace_hardirqs_off
- ldmia sp!, {r0-r3, ip, lr}
-@@ -114,7 +138,7 @@
- .endm
-
- .macro asm_trace_hardirqs_on_cond, cond
--#if defined(CONFIG_TRACE_IRQFLAGS)
-+#if defined(CONFIG_TRACE_IRQFLAGS) !defined(CONFIG_IPIPE)
- /*
-* actually the registers should be pushed and pop'd conditionally, but
-* after bl the flags are certainly clobbered
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index 62d2cb5..6216af3 100644
--- a/arch/arm/include/asm/atomic.h
@@ -1596,7 +1582,7 @@ index bb28af7..780ca50 100644
static inline void sp804_clockevents_init(void __iomem *base, unsigned int
irq, const char *name)
diff --git a/arch/arm/include/asm/ipipe.h b/arch/arm/include/asm/ipipe.h
new file mode 100644
-index 000..76c7b6b
+index 000..128fc6a
--- /dev/null
+++ b/arch/arm/include/asm/ipipe.h
@@ -0,0 +1,272 @@
@@ -1644,7 +1630,7 @@ index 000..76c7b6b
+#include linux/jump_label.h
+#include linux/ipipe_trace.h
+
-+#define IPIPE_CORE_RELEASE6
++#define IPIPE_CORE_RELEASE8
+
+struct ipipe_domain;
+
@@ -2891,7 +2877,7 @@ index c99e259..317b6a4 100644
#endif /* __ASM_ARM_SWITCH_TO_H */
diff --git a/arch/arm/include/asm/thread_info.h
b/arch/arm/include/asm/thread_info.h
-index 71a06b2..18d584a 100644
+index 3e635ee..b6c7fde 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -26,6 +26,7 @@ struct exec_domain;
@@ -2902,7 +2888,7 @@ index 71a06b2..18d584a 100644
typedef unsigned long mm_segment_t;
-@@ -77,7 +78,13 @@ struct thread_info {
+@@ -67,6 +68,11 @@ struct thread_info {
#ifdef CONFIG_ARM_THUMBEE
unsigned long thumbee_state; /* ThumbEE Handler Base
register */
#endif
@@ -2912,11 +2898,9 @@ index 71a06b2..18d584a 100644
+ struct ipipe_threadinfo ipipe_data;
+
struct restart_blockrestart_block;
-+
- struct arm_restart_blockarm_restart_block;
};
-@@ -161,6 +168,10 @@ extern int vfp_restore_user_hwstate(struct user_vfp
__user *,
+@@ -150,6 +156,10 @@ extern int vfp_restore_user_hwstate(struct user_vfp
__user *,
#define TIF_USING_IWMMXT 17
#define TIF_MEMDIE18 /* is terminating due to OOM killer */
#define TIF_RESTORE_SIGMASK 20
@@ -2927,7 +2911,7 @@ index 71a06b2..18d584a 100644
#define _TIF_SIGPENDING (1 TIF_SIGPENDING)
#define _TIF_NEED_RESCHED (1 TIF_NEED_RESCHED)
-@@ -171,6 +182,9 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user
*,
+@@ -160,6 +170,9 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user
*,
#define _TIF_SECCOMP (1 TIF_SECCOMP)
#define _TIF_USING_IWMMXT (1 TIF_USING_IWMMXT)
@@ -2937,7 +2921,7
[Xenomai-git] Philippe Gerum : cobalt/powerpc: upgrade I-pipe support
Module: xenomai-3
Branch: next
Commit: a62f9db5764ddd1382e5080bba65483f94cd412d
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=a62f9db5764ddd1382e5080bba65483f94cd412d
Author: Philippe Gerum r...@xenomai.org
Date: Thu Feb 5 09:02:36 2015 +0100
cobalt/powerpc: upgrade I-pipe support
---
...-6.patch = ipipe-core-3.14.28-powerpc-7.patch} | 195 +---
1 file changed, 128 insertions(+), 67 deletions(-)
diff --git
a/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.17-powerpc-6.patch
b/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.28-powerpc-7.patch
similarity index 98%
rename from
kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.17-powerpc-6.patch
rename to kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.28-powerpc-7.patch
index 883a78e..a9d7249 100644
--- a/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.17-powerpc-6.patch
+++ b/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.28-powerpc-7.patch
@@ -341,7 +341,7 @@ index 10be1dd..cfad863 100644
* or should we not care like we do now ? --BenH.
diff --git a/arch/powerpc/include/asm/ipipe.h
b/arch/powerpc/include/asm/ipipe.h
new file mode 100644
-index 000..f79050e
+index 000..29cf300
--- /dev/null
+++ b/arch/powerpc/include/asm/ipipe.h
@@ -0,0 +1,157 @@
@@ -386,7 +386,7 @@ index 000..f79050e
+#include linux/cache.h
+#include linux/threads.h
+
-+#define IPIPE_CORE_RELEASE6
++#define IPIPE_CORE_RELEASE7
+
+struct ipipe_domain;
+
@@ -3943,7 +3943,7 @@ index 115347f..dce0f48 100644
/*
diff --git a/arch/powerpc/mm/hash_native_64.c
b/arch/powerpc/mm/hash_native_64.c
-index 3ea26c2..8973a23 100644
+index 838de8e..f3147d2 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -198,7 +198,7 @@ static long native_hpte_insert(unsigned long hpte_group,
unsigned long vpn,
@@ -4699,7 +4699,7 @@ index 5f3b232..284d267 100644
u64 thread_id;
unsigned long ipi_debug_brk_mask;
diff --git a/arch/powerpc/platforms/pseries/lpar.c
b/arch/powerpc/platforms/pseries/lpar.c
-index b02af9e..82751da 100644
+index ccf6f16..ca49de2 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -184,7 +184,7 @@ static long pSeries_lpar_hpte_insert(unsigned long
hpte_group,
@@ -5468,7 +5468,7 @@ index 9203393..8b03381 100644
static struct uic * __init uic_init_one(struct device_node *node)
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
-index b079098..3251ebd 100644
+index bc5fbc2..41251db 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1452,7 +1452,7 @@ static void excprint(struct pt_regs *fp)
@@ -5661,18 +5661,18 @@ index 612dfc7..ffd8160 100644
.probe = serial8250_probe,
.remove = serial8250_remove,
diff --git a/fs/exec.c b/fs/exec.c
-index 31e46b1..424e32a 100644
+index ea4449d..aa73a12 100644
--- a/fs/exec.c
+++ b/fs/exec.c
-@@ -821,6 +821,7 @@ static int exec_mmap(struct mm_struct *mm)
+@@ -822,6 +822,7 @@ static int exec_mmap(struct mm_struct *mm)
{
struct task_struct *tsk;
- struct mm_struct * old_mm, *active_mm;
+ struct mm_struct *old_mm, *active_mm;
+ unsigned long flags;
/* Notify parent that we're no longer interested in the old VM */
tsk = current;
-@@ -844,8 +845,10 @@ static int exec_mmap(struct mm_struct *mm)
+@@ -845,8 +846,10 @@ static int exec_mmap(struct mm_struct *mm)
task_lock(tsk);
active_mm = tsk-active_mm;
tsk-mm = mm;
@@ -5680,9 +5680,9 @@ index 31e46b1..424e32a 100644
tsk-active_mm = mm;
activate_mm(active_mm, mm);
+ ipipe_mm_switch_unprotect(flags);
+ tsk-mm-vmacache_seqnum = 0;
+ vmacache_flush(tsk);
task_unlock(tsk);
- if (old_mm) {
- up_read(old_mm-mmap_sem);
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 33bd2de..f752d41 100644
--- a/include/asm-generic/atomic.h
@@ -5909,7 +5909,7 @@ index 493aa02..cb59b28 100644
/*
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
-index 67301a4..2562bfd 100644
+index 879065d..120fd3f 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -198,6 +198,10 @@ struct clocksource {
@@ -8306,7 +8306,7 @@ index 5b9b84b..6c8bb4d 100644
static inline void __raw_read_lock(rwlock_t *lock)
{
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index ccd0c6f..2591dfc 100644
+index 218b058..d579687 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -24,6 +24,7 @@ struct sched_param {
@@ -8317,7 +8317,7 @@ index ccd0c6f..2591dfc 100644
#include asm/page.h
#include asm/ptrace.h
-@@ -211,9 +212,17 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq
*cfs_rq);
+@@ -215,9 +216,17 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq
*cfs_rq);
#define TASK_WAKEKILL 128
#define TASK_WAKING
[Xenomai-git] Philippe Gerum : cobalt/blackfin: upgrade I-pipe support
Module: xenomai-3
Branch: next
Commit: 9bb68d39ec4ede2324d43fc688369c6b9b0720c4
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=9bb68d39ec4ede2324d43fc688369c6b9b0720c4
Author: Philippe Gerum r...@xenomai.org
Date: Thu Feb 5 09:05:07 2015 +0100
cobalt/blackfin: upgrade I-pipe support
---
...5.patch = ipipe-core-3.14.28-blackfin-6.patch} | 189 +---
1 file changed, 125 insertions(+), 64 deletions(-)
diff --git
a/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.14.17-blackfin-5.patch
b/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.14.28-blackfin-6.patch
similarity index 98%
rename from
kernel/cobalt/arch/blackfin/patches/ipipe-core-3.14.17-blackfin-5.patch
rename to
kernel/cobalt/arch/blackfin/patches/ipipe-core-3.14.28-blackfin-6.patch
index 0bd4dd2..3595c19 100644
--- a/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.14.17-blackfin-5.patch
+++ b/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.14.28-blackfin-6.patch
@@ -12,7 +12,7 @@ index 9ceccef..3c94fa7 100644
comment Processor and Board Settings
diff --git a/arch/blackfin/include/asm/ipipe.h
b/arch/blackfin/include/asm/ipipe.h
-index 17b5e92..f9a5b33 100644
+index 17b5e92..cc10543 100644
--- a/arch/blackfin/include/asm/ipipe.h
+++ b/arch/blackfin/include/asm/ipipe.h
@@ -28,7 +28,7 @@
@@ -32,7 +32,7 @@ index 17b5e92..f9a5b33 100644
-#define IPIPE_MAJOR_NUMBER1
-#define IPIPE_MINOR_NUMBER16
-#define IPIPE_PATCH_NUMBER1
-+#define IPIPE_CORE_RELEASE5
++#define IPIPE_CORE_RELEASE6
#ifdef CONFIG_SMP
#error I-pipe/blackfin: SMP not implemented
@@ -1884,18 +1884,18 @@ index 612dfc7..ffd8160 100644
.probe = serial8250_probe,
.remove = serial8250_remove,
diff --git a/fs/exec.c b/fs/exec.c
-index 31e46b1..424e32a 100644
+index ea4449d..aa73a12 100644
--- a/fs/exec.c
+++ b/fs/exec.c
-@@ -821,6 +821,7 @@ static int exec_mmap(struct mm_struct *mm)
+@@ -822,6 +822,7 @@ static int exec_mmap(struct mm_struct *mm)
{
struct task_struct *tsk;
- struct mm_struct * old_mm, *active_mm;
+ struct mm_struct *old_mm, *active_mm;
+ unsigned long flags;
/* Notify parent that we're no longer interested in the old VM */
tsk = current;
-@@ -844,8 +845,10 @@ static int exec_mmap(struct mm_struct *mm)
+@@ -845,8 +846,10 @@ static int exec_mmap(struct mm_struct *mm)
task_lock(tsk);
active_mm = tsk-active_mm;
tsk-mm = mm;
@@ -1903,9 +1903,9 @@ index 31e46b1..424e32a 100644
tsk-active_mm = mm;
activate_mm(active_mm, mm);
+ ipipe_mm_switch_unprotect(flags);
+ tsk-mm-vmacache_seqnum = 0;
+ vmacache_flush(tsk);
task_unlock(tsk);
- if (old_mm) {
- up_read(old_mm-mmap_sem);
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 33bd2de..f752d41 100644
--- a/include/asm-generic/atomic.h
@@ -2132,7 +2132,7 @@ index 493aa02..cb59b28 100644
/*
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
-index 67301a4..2562bfd 100644
+index 879065d..120fd3f 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -198,6 +198,10 @@ struct clocksource {
@@ -4529,7 +4529,7 @@ index 5b9b84b..6c8bb4d 100644
static inline void __raw_read_lock(rwlock_t *lock)
{
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index ccd0c6f..2591dfc 100644
+index 218b058..d579687 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -24,6 +24,7 @@ struct sched_param {
@@ -4540,7 +4540,7 @@ index ccd0c6f..2591dfc 100644
#include asm/page.h
#include asm/ptrace.h
-@@ -211,9 +212,17 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq
*cfs_rq);
+@@ -215,9 +216,17 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq
*cfs_rq);
#define TASK_WAKEKILL 128
#define TASK_WAKING 256
#define TASK_PARKED 512
@@ -4559,7 +4559,7 @@ index ccd0c6f..2591dfc 100644
extern char ___assert_task_state[1 - 2*!!(
sizeof(TASK_STATE_TO_CHAR_STR)-1 != ilog2(TASK_STATE_MAX)+1)];
-@@ -325,6 +334,15 @@ extern void trap_init(void);
+@@ -329,6 +338,15 @@ extern void trap_init(void);
extern void update_process_times(int user);
extern void scheduler_tick(void);
@@ -4575,7 +4575,7 @@ index ccd0c6f..2591dfc 100644
extern void sched_show_task(struct task_struct *p);
#ifdef CONFIG_LOCKUP_DETECTOR
-@@ -445,6 +463,9 @@ static inline int get_dumpable(struct mm_struct *mm)
+@@ -449,6 +467,9 @@ static inline int get_dumpable(struct mm_struct *mm)
#define MMF_VM_MERGEABLE 16 /* KSM may merge identical pages */
#define MMF_VM_HUGEPAGE 17 /* set when VM_HUGEPAGE is set
on vma */
#define MMF_EXE_FILE_CHANGED 18 /* see prctl_set_mm_exe_file() */
@@ -4585,7 +4585,7 @@ index ccd0c6f..2591dfc 100644
#define MMF_HAS_UPROBES 19 /* has uprobes */
#define MMF_RECALC_UPROBES
[Xenomai-git] Philippe Gerum : cobalt/x86: upgrade I-pipe support
Module: xenomai-3 Branch: next Commit: 1e48be22d3ec9a7450b2354a638df911d3c29175 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=1e48be22d3ec9a7450b2354a638df911d3c29175 Author: Philippe Gerum r...@xenomai.org Date: Thu Feb 5 09:04:08 2015 +0100 cobalt/x86: upgrade I-pipe support --- ...-x86-6.patch = ipipe-core-3.14.28-x86-7.patch} | 404 1 file changed, 252 insertions(+), 152 deletions(-) diff --git a/kernel/cobalt/arch/x86/patches/ipipe-core-3.14.17-x86-6.patch b/kernel/cobalt/arch/x86/patches/ipipe-core-3.14.28-x86-7.patch similarity index 97% rename from kernel/cobalt/arch/x86/patches/ipipe-core-3.14.17-x86-6.patch rename to kernel/cobalt/arch/x86/patches/ipipe-core-3.14.28-x86-7.patch index 09fef49..0086f76 100644 --- a/kernel/cobalt/arch/x86/patches/ipipe-core-3.14.17-x86-6.patch +++ b/kernel/cobalt/arch/x86/patches/ipipe-core-3.14.28-x86-7.patch @@ -1,5 +1,5 @@ diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index c718d9f..a48da09 100644 +index 98aa930..91e382d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -9,6 +9,7 @@ config 64BIT @@ -52,7 +52,7 @@ index c718d9f..a48da09 100644 bool Local APIC support on uniprocessors depends on X86_32 !SMP !X86_32_NON_STANDARD !PCI_MSI diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S -index 4299eb0..f55a4f0 100644 +index 92a2e93..56aa429 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S @@ -83,6 +83,43 @@ @@ -99,15 +99,15 @@ index 4299eb0..f55a4f0 100644 #ifdef CONFIG_PARAVIRT ENTRY(native_usergs_sysret32) swapgs -@@ -152,6 +189,7 @@ ENTRY(ia32_sysenter_target) - _ASM_EXTABLE(1b,ia32_badarg) - ASM_CLAC +@@ -162,6 +199,7 @@ ENTRY(ia32_sysenter_target) + sysenter_flags_fixed: + orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET) + IPIPE_IA32_SYSCALL %rax sysexit_from_sys_call sysexit_work testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET) CFI_REMEMBER_STATE jnz sysenter_tracesys -@@ -162,6 +200,7 @@ sysenter_do_call: +@@ -172,6 +210,7 @@ sysenter_do_call: sysenter_dispatch: call*ia32_sys_call_table(,%rax,8) movq%rax,RAX-ARGOFFSET(%rsp) @@ -115,7 +115,7 @@ index 4299eb0..f55a4f0 100644 DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET) -@@ -309,6 +348,7 @@ ENTRY(ia32_cstar_target) +@@ -325,6 +364,7 @@ ENTRY(ia32_cstar_target) _ASM_EXTABLE(1b,ia32_badarg) ASM_CLAC orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET) @@ -123,7 +123,7 @@ index 4299eb0..f55a4f0 100644 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET) CFI_REMEMBER_STATE jnz cstar_tracesys -@@ -319,6 +359,7 @@ cstar_do_call: +@@ -335,6 +375,7 @@ cstar_do_call: cstar_dispatch: call *ia32_sys_call_table(,%rax,8) movq %rax,RAX-ARGOFFSET(%rsp) @@ -131,7 +131,7 @@ index 4299eb0..f55a4f0 100644 DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET) -@@ -419,6 +460,7 @@ ENTRY(ia32_syscall) +@@ -435,6 +476,7 @@ ENTRY(ia32_syscall) this could be a problem. */ SAVE_ARGS 0,1,0 orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET) @@ -139,7 +139,7 @@ index 4299eb0..f55a4f0 100644 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET) jnz ia32_tracesys cmpq $(IA32_NR_syscalls-1),%rax -@@ -430,7 +472,10 @@ ia32_sysret: +@@ -446,7 +488,10 @@ ia32_sysret: movq %rax,RAX-ARGOFFSET(%rsp) ia32_ret_from_sys_call: CLEAR_RREGS -ARGOFFSET @@ -442,7 +442,7 @@ index 615fa90..e0a62ab 100644 extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask, diff --git a/arch/x86/include/asm/ipipe.h b/arch/x86/include/asm/ipipe.h new file mode 100644 -index 000..3e8492a +index 000..f6df562 --- /dev/null +++ b/arch/x86/include/asm/ipipe.h @@ -0,0 +1,96 @@ @@ -472,7 +472,7 @@ index 000..3e8492a + +#ifdef CONFIG_IPIPE + -+#define IPIPE_CORE_RELEASE6 ++#define IPIPE_CORE_RELEASE7 + +struct ipipe_domain; + @@ -1315,7 +1315,7 @@ index be12c53..4720e61 100644 #ifdef CONFIG_X86_32 diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h -index 8de6d9c..8ef5e27 100644 +index d54d1ee..66886e5 100644 --- a/arch/x86/include/asm/page_64_types.h +++ b/arch/x86/include/asm/page_64_types.h @@ -1,7 +1,11 @@ @@ -1433,7 +1433,7 @@ index d7f3b3b..310e55c 100644 [_tif_fork] i (_TIF_FORK), \ [thread_info] i (offsetof(struct task_struct, stack)), \ diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h -index e1940c0..270922b 100644 +index e870ea9..28df5ac 100644 ---
