Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 2f7955509710fd378a1ac96e19d29d5a0e3301fd

Authored by Cyrill Gorcunov
Committed by Ingo Molnar
1 parent 1b25f3b4e1
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

x86: copy.S - use GLOBAL,ENDPROC macros 

Impact: cleanup

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 14 additions and 26 deletions Side-by-side Diff

arch/x86/boot/copy.S
Diff comments   View file @ 2f79555
... ... @@ -8,6 +8,8 @@
8 8 *
9 9 * ----------------------------------------------------------------------- */
10 10  
  11 +#include <linux/linkage.h>
  12 +
11 13 /*
12 14 * Memory copy routines
13 15 */
... ... @@ -15,9 +17,7 @@
15 17 .code16gcc
16 18 .text
17 19  
18   - .globl memcpy
19   - .type memcpy, @function
20   -memcpy:
  20 +GLOBAL(memcpy)
21 21 pushw %si
22 22 pushw %di
23 23 movw %ax, %di
24 24  
... ... @@ -31,11 +31,9 @@
31 31 popw %di
32 32 popw %si
33 33 ret
34   - .size memcpy, .-memcpy
  34 +ENDPROC(memcpy)
35 35  
36   - .globl memset
37   - .type memset, @function
38   -memset:
  36 +GLOBAL(memset)
39 37 pushw %di
40 38 movw %ax, %di
41 39 movzbl %dl, %eax
42 40  
43 41  
44 42  
45 43  
46 44  
47 45  
48 46  
49 47  
... ... @@ -48,53 +46,43 @@
48 46 rep; stosb
49 47 popw %di
50 48 ret
51   - .size memset, .-memset
  49 +ENDPROC(memset)
52 50  
53   - .globl copy_from_fs
54   - .type copy_from_fs, @function
55   -copy_from_fs:
  51 +GLOBAL(copy_from_fs)
56 52 pushw %ds
57 53 pushw %fs
58 54 popw %ds
59 55 call memcpy
60 56 popw %ds
61 57 ret
62   - .size copy_from_fs, .-copy_from_fs
  58 +ENDPROC(copy_from_fs)
63 59  
64   - .globl copy_to_fs
65   - .type copy_to_fs, @function
66   -copy_to_fs:
  60 +GLOBAL(copy_to_fs)
67 61 pushw %es
68 62 pushw %fs
69 63 popw %es
70 64 call memcpy
71 65 popw %es
72 66 ret
73   - .size copy_to_fs, .-copy_to_fs
  67 +ENDPROC(copy_to_fs)
74 68  
75 69 #if 0 /* Not currently used, but can be enabled as needed */
76   -
77   - .globl copy_from_gs
78   - .type copy_from_gs, @function
79   -copy_from_gs:
  70 +GLOBAL(copy_from_gs)
80 71 pushw %ds
81 72 pushw %gs
82 73 popw %ds
83 74 call memcpy
84 75 popw %ds
85 76 ret
86   - .size copy_from_gs, .-copy_from_gs
87   - .globl copy_to_gs
  77 +ENDPROC(copy_from_gs)
88 78  
89   - .type copy_to_gs, @function
90   -copy_to_gs:
  79 +GLOBAL(copy_to_gs)
91 80 pushw %es
92 81 pushw %gs
93 82 popw %es
94 83 call memcpy
95 84 popw %es
96 85 ret
97   - .size copy_to_gs, .-copy_to_gs
98   -
  86 +ENDPROC(copy_to_gs)
99 87 #endif