Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c53421b1 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] proper flags type of spin_lock_irqsave() 



Convert various spin_lock_irqsave() callers to correctly use `unsigned long'.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp>
Cc: "Luck, Tony" <tony.luck@intel.com>
Acked-by: default avatarKyle McMartin <kyle@mcmartin.ca>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f5579f8c

arch/ia64/kernel/mca.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ ia64_log_get(int sal_info_type, u8 **buffer, int irq_safe) 
{

	sal_log_record_header_t     *log_buffer;

	u64                         total_len = 0;

	int                         s;

	unsigned long               s;



	IA64_LOG_LOCK(sal_info_type);

arch/ia64/sn/pci/pcibr/pcibr_ate.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ void pcibr_ate_free(struct pcibus_info *pcibus_info, int index) 


	volatile u64 ate;

	int count;

	u64 flags;

	unsigned long flags;



	if (pcibr_invalidate_ate) {

		/* For debugging purposes, clear the valid bit in the ATE */

arch/ia64/sn/pci/pcibr/pcibr_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ void sn_dma_flush(u64 addr) 
	int is_tio;

	int wid_num;

	int i, j;

	u64 flags;

	unsigned long flags;

	u64 itte;

	struct hubdev_info *hubinfo;

	struct sn_flush_device_kernel *p;

arch/parisc/kernel/firmware.c

+4 −3
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ void pdc_iodc_putc(unsigned char c) 
        static int __attribute__((aligned(8)))   iodc_retbuf[32];

        static char __attribute__((aligned(64))) iodc_dbuf[4096];

        unsigned int n;

	unsigned int flags;

	unsigned long flags;



        switch (c) {

        case '\n':
@@ -1088,7 +1088,8 @@ void pdc_iodc_putc(unsigned char c) 
 */

void pdc_iodc_outc(unsigned char c)

{

	unsigned int n, flags;

	unsigned int n;

	unsigned long flags;



	/* fill buffer with one caracter and print it */

        static int __attribute__((aligned(8)))   iodc_retbuf[32];
@@ -1113,7 +1114,7 @@ void pdc_iodc_outc(unsigned char c) 
 */

int pdc_iodc_getc(void)

{

	unsigned int flags;

	unsigned long flags;

        static int __attribute__((aligned(8)))   iodc_retbuf[32];

        static char __attribute__((aligned(64))) iodc_dbuf[4096];

	int ch;

arch/v850/kernel/memcons.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static DEFINE_SPINLOCK(memcons_lock); 


static size_t write (const char *buf, size_t len)

{

	int flags;

	unsigned long flags;

	char *point;



	spin_lock_irqsave (memcons_lock, flags);