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

Commit 2c5d9555 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull two parisc fixes from Helge Deller:
 "One fix to avoid usage of BITS_PER_LONG in user-space exported swab.h
  header which breaks compiling qemu, and one trivial fix for printk
  continuation in the parisc parport driver"

* 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Don't use BITS_PER_LONG in userspace-exported swab.h header
  parisc, parport_gsc: Fixes for printk continuation lines
parents 53cd1ad1 2ad5d52d

arch/parisc/include/asm/bitops.h

+7 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#endif



#include <linux/compiler.h>

#include <asm/types.h>		/* for BITS_PER_LONG/SHIFT_PER_LONG */

#include <asm/types.h>

#include <asm/byteorder.h>

#include <asm/barrier.h>

#include <linux/atomic.h>
@@ -17,6 +17,12 @@ 
 * to include/asm-i386/bitops.h or kerneldoc

 */



#if __BITS_PER_LONG == 64

#define SHIFT_PER_LONG 6

#else

#define SHIFT_PER_LONG 5

#endif



#define CHOP_SHIFTCOUNT(x) (((unsigned long) (x)) & (BITS_PER_LONG - 1))

arch/parisc/include/uapi/asm/bitsperlong.h

+0 −2
Original line number Diff line number Diff line
@@ -3,10 +3,8 @@ 


#if defined(__LP64__)

#define __BITS_PER_LONG 64

#define SHIFT_PER_LONG 6

#else

#define __BITS_PER_LONG 32

#define SHIFT_PER_LONG 5

#endif



#include <asm-generic/bitsperlong.h>

arch/parisc/include/uapi/asm/swab.h

+3 −2
Original line number Diff line number Diff line 
#ifndef _PARISC_SWAB_H

#define _PARISC_SWAB_H



#include <asm/bitsperlong.h>

#include <linux/types.h>

#include <linux/compiler.h>
@@ -38,7 +39,7 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) 
}

#define __arch_swab32 __arch_swab32



#if BITS_PER_LONG > 32

#if __BITS_PER_LONG > 32

/*

** From "PA-RISC 2.0 Architecture", HP Professional Books.

** See Appendix I page 8 , "Endian Byte Swapping".
@@ -61,6 +62,6 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 x) 
	return x;

}

#define __arch_swab64 __arch_swab64

#endif /* BITS_PER_LONG > 32 */

#endif /* __BITS_PER_LONG > 32 */



#endif /* _PARISC_SWAB_H */

drivers/parport/parport_gsc.c

+4 −4
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ struct parport *parport_gsc_probe_port(unsigned long base, 
		p->irq = PARPORT_IRQ_NONE;

	}

	if (p->irq != PARPORT_IRQ_NONE) {

		printk(", irq %d", p->irq);

		pr_cont(", irq %d", p->irq);



		if (p->dma == PARPORT_DMA_AUTO) {

			p->dma = PARPORT_DMA_NONE;
@@ -303,8 +303,8 @@ struct parport *parport_gsc_probe_port(unsigned long base, 
                                           is mandatory (see above) */

		p->dma = PARPORT_DMA_NONE;



	printk(" [");

#define printmode(x) {if(p->modes&PARPORT_MODE_##x){printk("%s%s",f?",":"",#x);f++;}}

	pr_cont(" [");

#define printmode(x) {if(p->modes&PARPORT_MODE_##x){pr_cont("%s%s",f?",":"",#x);f++;}}

	{

		int f = 0;

		printmode(PCSPP);
@@ -315,7 +315,7 @@ struct parport *parport_gsc_probe_port(unsigned long base, 
//		printmode(DMA);

	}

#undef printmode

	printk("]\n");

	pr_cont("]\n");



	if (p->irq != PARPORT_IRQ_NONE) {

		if (request_irq (p->irq, parport_irq_handler,