diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-27 10:36:54 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-27 10:36:54 -0700 |
| commit | c2834cf4746cf13501efc3489b1895bce58a4ccb (patch) | |
| tree | 13614c2ed7ec156d8518fd5bff4e1c252fb05792 /arch/ia64 | |
| parent | 05cb784c81a0fd1f97732156ea464bd392ce875a (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/process.c | 5 | ||||
| -rw-r--r-- | arch/ia64/sn/kernel/xpc_main.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index e484910246ad..66e840609808 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -807,16 +807,12 @@ machine_restart (char *restart_cmd) (*efi.reset_system)(EFI_RESET_WARM, 0, 0, NULL); } -EXPORT_SYMBOL(machine_restart); - void machine_halt (void) { cpu_halt(); } -EXPORT_SYMBOL(machine_halt); - void machine_power_off (void) { @@ -825,4 +821,3 @@ machine_power_off (void) machine_halt(); } -EXPORT_SYMBOL(machine_power_off); diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c index d580adcad927..bb1d5cf30440 100644 --- a/arch/ia64/sn/kernel/xpc_main.c +++ b/arch/ia64/sn/kernel/xpc_main.c @@ -420,7 +420,7 @@ xpc_activating(void *__partid) partid_t partid = (u64) __partid; struct xpc_partition *part = &xpc_partitions[partid]; unsigned long irq_flags; - struct sched_param param = { sched_priority: MAX_USER_RT_PRIO - 1 }; + struct sched_param param = { sched_priority: MAX_RT_PRIO - 1 }; int ret; |