diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /arch/um/sys-i386/checksum.S | |
| parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'arch/um/sys-i386/checksum.S')
| -rw-r--r-- | arch/um/sys-i386/checksum.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/um/sys-i386/checksum.S b/arch/um/sys-i386/checksum.S index 62c7e564f22e..f058d2f82e18 100644 --- a/arch/um/sys-i386/checksum.S +++ b/arch/um/sys-i386/checksum.S | |||
| @@ -243,13 +243,12 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst, | |||
| 243 | .previous | 243 | .previous |
| 244 | 244 | ||
| 245 | .align 4 | 245 | .align 4 |
| 246 | .globl csum_partial_copy_generic_i386 | 246 | |
| 247 | |||
| 248 | #ifndef CONFIG_X86_USE_PPRO_CHECKSUM | 247 | #ifndef CONFIG_X86_USE_PPRO_CHECKSUM |
| 249 | 248 | ||
| 250 | #define ARGBASE 16 | 249 | #define ARGBASE 16 |
| 251 | #define FP 12 | 250 | #define FP 12 |
| 252 | 251 | ||
| 253 | csum_partial_copy_generic_i386: | 252 | csum_partial_copy_generic_i386: |
| 254 | subl $4,%esp | 253 | subl $4,%esp |
| 255 | pushl %edi | 254 | pushl %edi |