summaryrefslogtreecommitdiffstats
path: root/include/asm-s390/smp.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-22 13:10:49 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-22 13:10:49 -0400
commit80bd6d7f5e0d872a0f5a151473d2a39d95d210a8 (patch)
treeb3a36048d6b7de88f7e906624ecb4b98816bb736 /include/asm-s390/smp.h
parent949d33e70f2c3e93bfe5265a50e40175b1ab1ec1 (diff)
parent2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff)
downloadop-kernel-dev-80bd6d7f5e0d872a0f5a151473d2a39d95d210a8.zip
op-kernel-dev-80bd6d7f5e0d872a0f5a151473d2a39d95d210a8.tar.gz
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-s390/smp.h')
-rw-r--r--include/asm-s390/smp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h
index 9473786..dd50e57 100644
--- a/include/asm-s390/smp.h
+++ b/include/asm-s390/smp.h
@@ -47,7 +47,7 @@ extern int smp_call_function_on(void (*func) (void *info), void *info,
#define PROC_CHANGE_PENALTY 20 /* Schedule penalty */
-#define smp_processor_id() (S390_lowcore.cpu_data.cpu_nr)
+#define raw_smp_processor_id() (S390_lowcore.cpu_data.cpu_nr)
extern int smp_get_cpu(cpumask_t cpu_map);
extern void smp_put_cpu(int cpu);
OpenPOWER on IntegriCloud