diff options
| author | Guillem Jover <guillem@debian.org> | 2009-12-09 02:59:26 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-03-20 02:09:13 +0100 |
| commit | 735cf19fdebf4a3df886426a51cad78b7ef025f2 (patch) | |
| tree | 9e944a89cb6ce3c5f3a61df6050c170d49291711 /linux/dev/include/asm-i386 | |
| parent | 5b6966db94a3f3113f7795d9513c832bd1a43f26 (diff) | |
Change types holding cpu flags from int to long
On amd64 the cpu flags is a 64-bit word, and long on 32-bit systems is
32-bit wide anyway.
* linux/dev/glue/kmem.c (linux_kmalloc, linux_kfree, __get_free_pages,
free_pages): Use unsigned long instead of unsigned.
* linux/dev/include/asm-i386/system.h (__save_flags, __restore_flags):
Likewise.
* linux/dev/kernel/printk.c (printk): Likewise.
* linux/src/drivers/scsi/advansys.c (DvcEnterCritical, DvcLeaveCritical,
advansys_queuecommand, advansys_abort, advansys_reset, advansys_interrupt,
interrupts_enabled, AdvISR): Likewise.
* linux/src/drivers/scsi/aha152x.c (aha152x_intr): Likewise.
* linux/src/drivers/scsi/aha1542.c (aha1542_intr_handle): Likewise.
* linux/src/drivers/scsi/aic7xxx.c (aic7xxx_done_cmds_complete): Likewise.
* linux/src/drivers/scsi/ultrastor.c (log_ultrastor_abort,
ultrastor_queuecommand, ultrastor_abort): Likewise.
Diffstat (limited to 'linux/dev/include/asm-i386')
| -rw-r--r-- | linux/dev/include/asm-i386/system.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/dev/include/asm-i386/system.h b/linux/dev/include/asm-i386/system.h index 3e17d2d..f26a33e 100644 --- a/linux/dev/include/asm-i386/system.h +++ b/linux/dev/include/asm-i386/system.h @@ -224,9 +224,9 @@ static inline unsigned long __xchg(unsigned long x, void * ptr, int size) #define __sti() __asm__ __volatile__ ("sti": : :"memory") #define __cli() __asm__ __volatile__ ("cli": : :"memory") #define __save_flags(x) \ -__asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */ :"memory") +__asm__ __volatile__("pushf ; pop %0" : "=r" (x): /* no input */ :"memory") #define __restore_flags(x) \ -__asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory") +__asm__ __volatile__("push %0 ; popf": /* no output */ :"g" (x):"memory") #ifdef __SMP__ |