i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Just some cleanups.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2602 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-01-30 19:49:24 +00:00
parent 9e63d45563
commit 7a6bb51e08
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/arch/x86/arch_smp.c
+8 -8
View File
@@ -25,9 +25,9 @@
static uint32 *apic = NULL; static uint32 *apic = NULL;
static uint32 cpu_apic_id[SMP_MAX_CPUS] = { 0, 0}; static uint32 cpu_apic_id[SMP_MAX_CPUS] = {0, 0};
static uint32 cpu_os_id[SMP_MAX_CPUS] = { 0, 0}; static uint32 cpu_os_id[SMP_MAX_CPUS] = {0, 0};
static uint32 cpu_apic_version[SMP_MAX_CPUS] = { 0, 0}; static uint32 cpu_apic_version[SMP_MAX_CPUS] = {0, 0};
static uint32 *ioapic = NULL; static uint32 *ioapic = NULL;
static uint32 apic_timer_tics_per_sec = 0; static uint32 apic_timer_tics_per_sec = 0;
@@ -74,15 +74,15 @@ i386_smp_error_interrupt(void *data)
} }
static unsigned int static uint32
apic_read(unsigned int *addr) apic_read(uint32 *addr)
{ {
return *addr; return *addr;
} }
static void static void
apic_write(unsigned int *addr, unsigned int data) apic_write(uint32 *addr, uint32 data)
{ {
*addr = data; *addr = data;
} }
@@ -157,9 +157,9 @@ arch_smp_ack_interrupt(void)
int int
arch_smp_set_apic_timer(bigtime_t relative_timeout) arch_smp_set_apic_timer(bigtime_t relative_timeout)
{ {
unsigned int config; uint32 config;
uint32 ticks;
int state; int state;
unsigned int ticks;
if (apic == NULL) if (apic == NULL)
return -1; return -1;
src/kernel/core/smp.c
+4 -4
View File
@@ -359,7 +359,7 @@ smp_intercpu_int_handler(void)
void void
smp_send_ici(int target_cpu, int message, unsigned long data, unsigned long data2, unsigned long data3, void *data_ptr, int flags) smp_send_ici(int target_cpu, int message, uint32 data, uint32 data2, uint32 data3, void *data_ptr, int flags)
{ {
struct smp_msg *msg; struct smp_msg *msg;
@@ -417,7 +417,7 @@ smp_send_ici(int target_cpu, int message, unsigned long data, unsigned long data
void void
smp_send_broadcast_ici(int message, unsigned long data, unsigned long data2, unsigned long data3, void *data_ptr, int flags) smp_send_broadcast_ici(int message, uint32 data, uint32 data2, uint32 data3, void *data_ptr, int flags)
{ {
struct smp_msg *msg; struct smp_msg *msg;
@@ -505,8 +505,8 @@ smp_wait_for_ap_cpus(kernel_args *ka)
int retry; int retry;
do { do {
retry = 0; retry = 0;
for(i=1; i < ka->num_cpus; i++) { for (i = 1; i < ka->num_cpus; i++) {
if(boot_cpu_spin[i] != 1) if (boot_cpu_spin[i] != 1)
retry = 1; retry = 1;
} }
} while (retry == 1); } while (retry == 1);