Changeset 5f85c91 in mainline for arch/amd64

Timestamp:

2005-11-08T12:22:35Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

36a140b

Parents:

389f41e

Message:

make configuration variables usage consistent

Location:

arch/amd64

Files:

• Makefile.inc (modified) (1 diff)
• src/amd64.c (modified) (2 diffs)
• src/interrupt.c (modified) (1 diff)
• src/smp/ap.S (modified) (2 diffs)

arch/amd64/Makefile.inc

@@ -61 +61 @@
 
 ifeq ($(CONFIG_SMP),y)
-        DEFS += -DSMP
+        DEFS += -DCONFIG_SMP
 endif
 ifeq ($(CONFIG_HT),y)
-        DEFS += -DHT
+        DEFS += -DCONFIG_HT
 endif
 ifeq ($(CONFIG_FPU_LAZY),y)
-        DEFS += -DFPU_LAZY
+        DEFS += -DCONFIG_FPU_LAZY
 endif
 

arch/amd64/src/amd64.c

@@ -76 +76 @@
                 trap_register(VECTOR_SYSCALL, syscall);
                 
-                #ifdef __SMP__
+                #ifdef CONFIG_SMP
                 trap_register(VECTOR_TLB_SHOOTDOWN_IPI, tlb_shootdown_ipi);
                 trap_register(VECTOR_WAKEUP_IPI, wakeup_ipi);
-                #endif /* __SMP__ */
+                #endif /* CONFIG_SMP */
         }
 }
@@ -95 +95 @@
                 memory_print_map();
                 
-                #ifdef __SMP__
+                #ifdef CONFIG_SMP
                 acpi_init();
-                #endif /* __SMP__ */
+                #endif /* CONFIG_SMP */
         }
 }

arch/amd64/src/interrupt.c

@@ -140 +140 @@
 void nm_fault(__u8 n, __native stack[])
 {
-#ifdef FPU_LAZY     
+#ifdef CONFIG_FPU_LAZY     
         scheduler_fpu_lazy_request();
 #else

arch/amd64/src/smp/ap.S

@@ -40 +40 @@
 .section K_TEXT_START_2, "ax"
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 
 .global ap_boot
@@ -101 +101 @@
         
         
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */