From fc58187c6d7a5a2a5ce074da44a12159740d11c0 Mon Sep 17 00:00:00 2001 From: Bodo Stroesser Date: Fri, 6 May 2005 21:30:53 -0700 Subject: [PATCH] --- yaml --- r: 1083 b: refs/heads/master c: b8bd0220c1ac6273eda66e25d992654219f846b6 h: refs/heads/master i: 1081: 2ece35abd5fc06d9655c9eedba03c4ecb6057450 1079: 9eaa8621f82d2cec2d1647f48fd2e9f1e2d101c4 v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/process_kern.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 552668d7e84d..926a2cde9f38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f3be588b51e809476cdecd4eaf6fd04670d9c36 +refs/heads/master: b8bd0220c1ac6273eda66e25d992654219f846b6 diff --git a/trunk/arch/um/kernel/process_kern.c b/trunk/arch/um/kernel/process_kern.c index dea80d4357f0..3dcb080c44a0 100644 --- a/trunk/arch/um/kernel/process_kern.c +++ b/trunk/arch/um/kernel/process_kern.c @@ -466,12 +466,21 @@ int singlestepping(void * t) return 2; } +/* + * Only x86 and x86_64 have an arch_align_stack(). + * All other arches have "#define arch_align_stack(x) (x)" + * in their asm/system.h + * As this is included in UML from asm-um/system-generic.h, + * we can use it to behave as the subarch does. + */ +#ifndef arch_align_stack unsigned long arch_align_stack(unsigned long sp) { if (randomize_va_space) sp -= get_random_int() % 8192; return sp & ~0xf; } +#endif /*