Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+14
-9
+7
-1
arch/parisc/include/asm/bitops.h
+7
-1
arch/parisc/include/asm/bitops.h
···
6
6
#endif
7
7
8
8
#include <linux/compiler.h>
9
-
#include <asm/types.h> /* for BITS_PER_LONG/SHIFT_PER_LONG */
9
+
#include <asm/types.h>
10
10
#include <asm/byteorder.h>
11
11
#include <asm/barrier.h>
12
12
#include <linux/atomic.h>
···
16
16
* for a detailed description of the functions please refer
17
17
* to include/asm-i386/bitops.h or kerneldoc
18
18
*/
19
+
20
+
#if __BITS_PER_LONG == 64
21
+
#define SHIFT_PER_LONG 6
22
+
#else
23
+
#define SHIFT_PER_LONG 5
24
+
#endif
19
25
20
26
#define CHOP_SHIFTCOUNT(x) (((unsigned long) (x)) & (BITS_PER_LONG - 1))
21
27
-2
arch/parisc/include/uapi/asm/bitsperlong.h
-2
arch/parisc/include/uapi/asm/bitsperlong.h
+3
-2
arch/parisc/include/uapi/asm/swab.h
+3
-2
arch/parisc/include/uapi/asm/swab.h
···
1
1
#ifndef _PARISC_SWAB_H
2
2
#define _PARISC_SWAB_H
3
3
4
+
#include <asm/bitsperlong.h>
4
5
#include <linux/types.h>
5
6
#include <linux/compiler.h>
6
7
···
39
38
}
40
39
#define __arch_swab32 __arch_swab32
41
40
42
-
#if BITS_PER_LONG > 32
41
+
#if __BITS_PER_LONG > 32
43
42
/*
44
43
** From "PA-RISC 2.0 Architecture", HP Professional Books.
45
44
** See Appendix I page 8 , "Endian Byte Swapping".
···
62
61
return x;
63
62
}
64
63
#define __arch_swab64 __arch_swab64
65
-
#endif /* BITS_PER_LONG > 32 */
64
+
#endif /* __BITS_PER_LONG > 32 */
66
65
67
66
#endif /* _PARISC_SWAB_H */
+4
-4
drivers/parport/parport_gsc.c
+4
-4
drivers/parport/parport_gsc.c
···
293
293
p->irq = PARPORT_IRQ_NONE;
294
294
}
295
295
if (p->irq != PARPORT_IRQ_NONE) {
296
-
printk(", irq %d", p->irq);
296
+
pr_cont(", irq %d", p->irq);
297
297
298
298
if (p->dma == PARPORT_DMA_AUTO) {
299
299
p->dma = PARPORT_DMA_NONE;
···
303
303
is mandatory (see above) */
304
304
p->dma = PARPORT_DMA_NONE;
305
305
306
-
printk(" [");
307
-
#define printmode(x) {if(p->modes&PARPORT_MODE_##x){printk("%s%s",f?",":"",#x);f++;}}
306
+
pr_cont(" [");
307
+
#define printmode(x) {if(p->modes&PARPORT_MODE_##x){pr_cont("%s%s",f?",":"",#x);f++;}}
308
308
{
309
309
int f = 0;
310
310
printmode(PCSPP);
···
315
315
// printmode(DMA);
316
316
}
317
317
#undef printmode
318
-
printk("]\n");
318
+
pr_cont("]\n");
319
319
320
320
if (p->irq != PARPORT_IRQ_NONE) {
321
321
if (request_irq (p->irq, parport_irq_handler,