]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8a90930)
[PATCH] Removing SYMBOL_NAME part 6
authorBrian Gerst <bgerst@didntduck.org>
Tue, 30 Apr 2002 07:38:02 +0000 (00:38 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Tue, 30 Apr 2002 07:38:02 +0000 (00:38 -0700)
Last remaining instances removed.

drivers/pnp/pnpbios_core.c patch | blob | history
drivers/scsi/seagate.c patch | blob | history
include/linux/linkage.h patch | blob | history
include/net/profile.h patch | blob | history
sound/oss/vidc_fill.S patch | blob | history

diff --git a/drivers/pnp/pnpbios_core.c b/drivers/pnp/pnpbios_core.c
index e4405e647f3c493c1e4e07b3c8e0864864aee5c1..73df0d76ab754336304f18bfd7cec512c84e8fed 100644 (file)
--- a/drivers/pnp/pnpbios_core.c
+++ b/drivers/pnp/pnpbios_core.c
@@ -113,12 +113,12 @@ asmlinkage void pnp_bios_callfunc(void);
 __asm__(
        ".text                  \n"
        __ALIGN_STR "\n"
-       SYMBOL_NAME_STR(pnp_bios_callfunc) ":\n"
+       "pnp_bios_callfunc:\n"
        "       pushl %edx      \n"
        "       pushl %ecx      \n"
        "       pushl %ebx      \n"
        "       pushl %eax      \n"
-       "       lcallw " SYMBOL_NAME_STR(pnp_bios_callpoint) "\n"
+       "       lcallw pnp_bios_callpoint\n"
        "       addl $16, %esp  \n"
        "       lret            \n"
        ".previous              \n"
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c
index 4b001979362498624cb3d0ac085ccd18115b94b6..4a330405927de1289b93bd2c5bdf7a53a4fbbc47 100644 (file)
--- a/drivers/scsi/seagate.c
+++ b/drivers/scsi/seagate.c
@@ -1285,8 +1285,8 @@ static int internal_command (unsigned char target, unsigned char lun,
                                                        /* Test for any data here at all. */
                                                        "orl %%ecx, %%ecx\n\t"
                                                        "jz 2f\n\t" "cld\n\t"
-/*                    "movl " SYMBOL_NAME_STR(st0x_cr_sr) ", %%ebx\n\t"  */
-/*                    "movl " SYMBOL_NAME_STR(st0x_dr) ", %%edi\n\t"  */
+/*                    "movl st0x_cr_sr, %%ebx\n\t"  */
+/*                    "movl st0x_dr, %%edi\n\t"  */
                                                        "1:\t"
                                                        "movb (%%ebx), %%al\n\t"
                                                        /* Test for BSY */
@@ -1461,8 +1461,8 @@ static int internal_command (unsigned char target, unsigned char lun,
                                                        /* Test for room to read */
                                                        "orl %%ecx, %%ecx\n\t"
                                                        "jz 2f\n\t" "cld\n\t"
-/*                "movl " SYMBOL_NAME_STR(st0x_cr_sr) ", %%esi\n\t"  */
-/*                "movl " SYMBOL_NAME_STR(st0x_dr) ", %%ebx\n\t"  */
+/*                "movl st0x_cr_sr, %%esi\n\t"  */
+/*                "movl st0x_dr, %%ebx\n\t"  */
                                                        "1:\t"
                                                        "movb (%%esi), %%al\n\t"
                                                        /* Test for BSY */
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index e9bf89431961185ca9cc95d282bd82a373262fc0..051b05866e2b872cadda9bf8909f6a725c3b90dc 100644 (file)
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -17,14 +17,6 @@
 #define asmlinkage CPP_ASMLINKAGE
 #endif
 
-#define SYMBOL_NAME_STR(X) #X
-#define SYMBOL_NAME(X) X
-#ifdef __STDC__
-#define SYMBOL_NAME_LABEL(X) X##:
-#else
-#define SYMBOL_NAME_LABEL(X) X/**/:
-#endif
-
 #ifdef __arm__
 #define __ALIGN .align 0
 #define __ALIGN_STR ".align 0"
@@ -54,9 +46,9 @@
 #define ALIGN_STR __ALIGN_STR
 
 #define ENTRY(name) \
-  .globl SYMBOL_NAME(name); \
+  .globl name; \
   ALIGN; \
-  SYMBOL_NAME_LABEL(name)
+  name:
 
 #endif
 
diff --git a/include/net/profile.h b/include/net/profile.h
index 5393f0d04154e2fdf33a9bbcaef14535311f964b..fd6a3b346990a8d7df7103f9238ad126bdd70143 100644 (file)
--- a/include/net/profile.h
+++ b/include/net/profile.h
@@ -44,7 +44,7 @@ static inline void  net_profile_accumulate(struct timeval *entered,
                              "sbbl %3,%1\n\t" 
                              "addl %4,%0\n\t" 
                              "adcl %5,%1\n\t" 
-                             "subl " SYMBOL_NAME_STR(net_profile_adjust) "+4,%0\n\t" 
+                             "subl net_profile_adjust+4,%0\n\t" 
                              "sbbl $0,%1\n\t" 
                              : "=r" (acc->tv_usec), "=r" (acc->tv_sec)
                              : "g" (entered->tv_usec), "g" (entered->tv_sec),
diff --git a/sound/oss/vidc_fill.S b/sound/oss/vidc_fill.S
index 5a90f9da2bcc0ba6b15083159b3d812d6be0c477..2c3b142f356643f3ba821a6c2b98dbee128888ca 100644 (file)
--- a/sound/oss/vidc_fill.S
+++ b/sound/oss/vidc_fill.S
@@ -20,7 +20,7 @@
 ENTRY(vidc_fill_1x8_u)
                mov     ip, #0xff00
 1:             cmp     r0, r1
-               bge     SYMBOL_NAME(vidc_clear)
+               bge     vidc_clear
                ldrb    r4, [r0], #1
                eor     r4, r4, #0x80
                and     r4, ip, r4, lsl #8
@@ -33,7 +33,7 @@ ENTRY(vidc_fill_1x8_u)
 ENTRY(vidc_fill_2x8_u)
                mov     ip, #0xff00
 1:             cmp     r0, r1
-               bge     SYMBOL_NAME(vidc_clear)
+               bge     vidc_clear
                ldr     r4, [r0], #2
                and     r5, r4, ip
                and     r4, ip, r4, lsl #8
@@ -47,7 +47,7 @@ ENTRY(vidc_fill_2x8_u)
 ENTRY(vidc_fill_1x8_s)
                mov     ip, #0xff00
 1:             cmp     r0, r1
-               bge     SYMBOL_NAME(vidc_clear)
+               bge     vidc_clear
                ldrb    r4, [r0], #1
                and     r4, ip, r4, lsl #8
                orr     r4, r4, r4, lsl #16
@@ -59,7 +59,7 @@ ENTRY(vidc_fill_1x8_s)
 ENTRY(vidc_fill_2x8_s)
                mov     ip, #0xff00
 1:             cmp     r0, r1
-               bge     SYMBOL_NAME(vidc_clear)
+               bge     vidc_clear
                ldr     r4, [r0], #2
                and     r5, r4, ip
                and     r4, ip, r4, lsl #8
@@ -74,7 +74,7 @@ ENTRY(vidc_fill_1x16_s)
                mov     ip, #0xff00
                orr     ip, ip, ip, lsr #8
 1:             cmp     r0, r1
-               bge     SYMBOL_NAME(vidc_clear)
+               bge     vidc_clear
                ldr     r5, [r0], #2
                and     r4, r5, ip
                orr     r4, r4, r4, lsl #16
@@ -92,7 +92,7 @@ ENTRY(vidc_fill_2x16_s)
                mov     ip, #0xff00
                orr     ip, ip, ip, lsr #8
 1:             cmp     r0, r1
-               bge     SYMBOL_NAME(vidc_clear)
+               bge     vidc_clear
                ldr     r4, [r0], #4
                str     r4, [r2], #4
                cmp     r0, r1
@@ -136,10 +136,10 @@ ENTRY(vidc_clear)
 
 ENTRY(vidc_sound_dma_irq)
                stmfd   sp!, {r4 - r8, lr}
-               ldr     r8, =SYMBOL_NAME(dma_start)
+               ldr     r8, =dma_start
                ldmia   r8, {r0, r1, r2, r3, r4, r5}
                teq     r1, #0
-               adreq   r4, SYMBOL_NAME(vidc_fill_noaudio)
+               adreq   r4, vidc_fill_noaudio
                moveq   r7, #1 << 31
                movne   r7, #0
                mov     ip, #IOMD_BASE & 0xff000000
@@ -193,26 +193,26 @@ ENTRY(vidc_sound_dma_irq)
                mov     pc, lr
 
                .data
-               .globl  SYMBOL_NAME(dma_interrupt)
-SYMBOL_NAME(dma_interrupt):
+               .globl  dma_interrupt
+dma_interrupt:
                .long   0                               @ r3
-               .globl  SYMBOL_NAME(dma_pbuf)
-SYMBOL_NAME(dma_pbuf):
+               .globl  dma_pbuf
+dma_pbuf:
                .long   0                               @ r4
                .long   0                               @ r5
-               .globl  SYMBOL_NAME(dma_start)
-SYMBOL_NAME(dma_start):
+               .globl  dma_start
+dma_start:
                .long   0                               @ r0
-               .globl  SYMBOL_NAME(dma_count)
-SYMBOL_NAME(dma_count):
+               .globl  dma_count
+dma_count:
                .long   0                               @ r1
-               .globl  SYMBOL_NAME(dma_buf)
-SYMBOL_NAME(dma_buf):
+               .globl  dma_buf
+dma_buf:
                .long   0                               @ r2
                .long   0                               @ r3
-               .globl  SYMBOL_NAME(vidc_filler)
-SYMBOL_NAME(vidc_filler):
-               .long   SYMBOL_NAME(vidc_fill_noaudio)  @ r4
-               .globl  SYMBOL_NAME(dma_bufsize)
-SYMBOL_NAME(dma_bufsize):
+               .globl  vidc_filler
+vidc_filler:
+               .long   vidc_fill_noaudio               @ r4
+               .globl  dma_bufsize
+dma_bufsize:
                .long   0x1000                          @ r5
Linux kernels and configurations used by Zygo.