History

Merge branch 'for-v3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

Pull build fixes for less mainstream architectures from Paul Gortmaker: "These are fixes for frv(1), blackfin(2), powerpc(1) and xtensa(4). Fortunately the touches are nearly all specific to files just used by the arch in question. The two touches to shared/common files [kernel/irq/debug.h and drivers/pci/Makefile] are trivial to assess as no risk to anyone. Half of them relate to xtensa directly. It was only when I fixed the last xtensa issue that I realized that the arch has been broken for a significant time, and isn't a specific v3.4 regression. So if you wanted, we could leave xtensa lying bleeding in the street for a couple more weeks and queue those for 3.5. But given they are no risk to anyone outside of xtensa, I figured to just leave them in. If you are OK with taking the xtensa fixes, then please pull to get: - one last implicit include uncovered by system.h that is in a file specific to just one powerpc defconfig. (I'd sync'd with BenH). - fix an oversight in the PCI makefile where shared code wasn't being compiled for ARCH=frv - fix a missing include for GPIO in blackfin framebuffer. - audit and tag endif in blackfin ezkit board file, in order to find and fix the misplaced endif masking a block of code. - fix irq/debug.h choice of temporary macro names to be more internal so they don't conflict with names used by xtensa. - fix a reference to an undeclared local var in xtensa's signal.c - fix an implicit bug.h usage in xtensa's asm/io.h uncovered by my removing bug.h from kernel.h - fix xtensa to properly indicate it is using asm-generic/hardirq.h in order to resolve the link error - undefined ack_bad_irq The xtensa still fails final link as my latest binutils does something evil when ld forward-relocates unlikely() blocks, but in theory people who have older/valid toolchains could now use the thing." * 'for-v3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: xtensa: fix build fail on undefined ack_bad_irq blackfin: fix ifdef fustercluck in mach-bf538/boards/ezkit.c blackfin: fix compile error in bfin-lq035q1-fb.c pci: frv architecture needs generic setup-bus infrastructure irq: hide debug macros so they don't collide with others. xtensa: fix build error in xtensa/include/asm/io.h xtensa: fix build failure in xtensa/kernel/signal.c powerpc: fix system.h fallout in sysdev/scom.c [chroma_defconfig]

Linus Torvalds committed 14 years ago

Commit f6072452 parents d7e69bc 8e12a038 files · +50 −49Browse files

Unified · Split

8 files
  1. arch/blackfin/mach-bf538/boards/ezkit.c +26 −27
  2. arch/powerpc/sysdev/scom.c +1 −0
  3. arch/xtensa/include/asm/hardirq.h +0 −3
  4. arch/xtensa/include/asm/io.h +1 −0
  5. arch/xtensa/kernel/signal.c +1 −0
  6. drivers/pci/Makefile +1 −0
  7. drivers/video/bfin-lq035q1-fb.c +1 −0
  8. kernel/irq/debug.h +19 −19
arch/blackfin/mach-bf538/boards/ezkit.c+26−27
@@ -38,7 +38,7 @@ static struct platform_device rtc_device = { · 37 unmodified lines
3838 .name = "rtc-bfin",
3939 .id = -1,
4040 };
41−#endif
41+#endif /* CONFIG_RTC_DRV_BFIN */
4242
4343 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
4444 #ifdef CONFIG_SERIAL_BFIN_UART0
@@ -100,7 +100,7 @@ static struct platform_device bfin_uart0_device = { · 55 unmodified lines
100100 .platform_data = &bfin_uart0_peripherals, /* Passed to driver */
101101 },
102102 };
103−#endif
103+#endif /* CONFIG_SERIAL_BFIN_UART0 */
104104 #ifdef CONFIG_SERIAL_BFIN_UART1
105105 static struct resource bfin_uart1_resources[] = {
106106 {
@@ -148,7 +148,7 @@ static struct platform_device bfin_uart1_device = { · 41 unmodified lines
148148 .platform_data = &bfin_uart1_peripherals, /* Passed to driver */
149149 },
150150 };
151−#endif
151+#endif /* CONFIG_SERIAL_BFIN_UART1 */
152152 #ifdef CONFIG_SERIAL_BFIN_UART2
153153 static struct resource bfin_uart2_resources[] = {
154154 {
@@ -196,8 +196,8 @@ static struct platform_device bfin_uart2_device = { · 41 unmodified lines
196196 .platform_data = &bfin_uart2_peripherals, /* Passed to driver */
197197 },
198198 };
199−#endif
200−#endif
199+#endif /* CONFIG_SERIAL_BFIN_UART2 */
200+#endif /* CONFIG_SERIAL_BFIN */
201201
202202 #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
203203 #ifdef CONFIG_BFIN_SIR0
@@ -224,7 +224,7 @@ static struct platform_device bfin_sir0_device = { · 20 unmodified lines
224224 .num_resources = ARRAY_SIZE(bfin_sir0_resources),
225225 .resource = bfin_sir0_resources,
226226 };
227−#endif
227+#endif /* CONFIG_BFIN_SIR0 */
228228 #ifdef CONFIG_BFIN_SIR1
229229 static struct resource bfin_sir1_resources[] = {
230230 {
@@ -249,7 +249,7 @@ static struct platform_device bfin_sir1_device = { · 18 unmodified lines
249249 .num_resources = ARRAY_SIZE(bfin_sir1_resources),
250250 .resource = bfin_sir1_resources,
251251 };
252−#endif
252+#endif /* CONFIG_BFIN_SIR1 */
253253 #ifdef CONFIG_BFIN_SIR2
254254 static struct resource bfin_sir2_resources[] = {
255255 {
@@ -274,8 +274,8 @@ static struct platform_device bfin_sir2_device = { · 18 unmodified lines
274274 .num_resources = ARRAY_SIZE(bfin_sir2_resources),
275275 .resource = bfin_sir2_resources,
276276 };
277−#endif
278−#endif
277+#endif /* CONFIG_BFIN_SIR2 */
278+#endif /* CONFIG_BFIN_SIR */
279279
280280 #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
281281 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
@@ -311,7 +311,7 @@ static struct platform_device bfin_sport0_uart_device = { · 29 unmodified lines
311311 .platform_data = &bfin_sport0_peripherals, /* Passed to driver */
312312 },
313313 };
314−#endif
314+#endif /* CONFIG_SERIAL_BFIN_SPORT0_UART */
315315 #ifdef CONFIG_SERIAL_BFIN_SPORT1_UART
316316 static struct resource bfin_sport1_uart_resources[] = {
317317 {
@@ -345,7 +345,7 @@ static struct platform_device bfin_sport1_uart_device = { · 27 unmodified lines
345345 .platform_data = &bfin_sport1_peripherals, /* Passed to driver */
346346 },
347347 };
348−#endif
348+#endif /* CONFIG_SERIAL_BFIN_SPORT1_UART */
349349 #ifdef CONFIG_SERIAL_BFIN_SPORT2_UART
350350 static struct resource bfin_sport2_uart_resources[] = {
351351 {
@@ -379,7 +379,7 @@ static struct platform_device bfin_sport2_uart_device = { · 27 unmodified lines
379379 .platform_data = &bfin_sport2_peripherals, /* Passed to driver */
380380 },
381381 };
382−#endif
382+#endif /* CONFIG_SERIAL_BFIN_SPORT2_UART */
383383 #ifdef CONFIG_SERIAL_BFIN_SPORT3_UART
384384 static struct resource bfin_sport3_uart_resources[] = {
385385 {
@@ -413,8 +413,8 @@ static struct platform_device bfin_sport3_uart_device = { · 27 unmodified lines
413413 .platform_data = &bfin_sport3_peripherals, /* Passed to driver */
414414 },
415415 };
416−#endif
417−#endif
416+#endif /* CONFIG_SERIAL_BFIN_SPORT3_UART */
417+#endif /* CONFIG_SERIAL_BFIN_SPORT */
418418
419419 #if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
420420 static unsigned short bfin_can_peripherals[] = {
@@ -452,7 +452,7 @@ static struct platform_device bfin_can_device = { · 31 unmodified lines
452452 .platform_data = &bfin_can_peripherals, /* Passed to driver */
453453 },
454454 };
455−#endif
455+#endif /* CONFIG_CAN_BFIN */
456456
457457 /*
458458 * USB-LAN EzExtender board
@@ -488,7 +488,7 @@ static struct platform_device smc91x_device = { · 29 unmodified lines
488488 .platform_data = &smc91x_info,
489489 },
490490 };
491−#endif
491+#endif /* CONFIG_SMC91X */
492492
493493 #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
494494 /* all SPI peripherals info goes here */
@@ -518,7 +518,8 @@ static struct flash_platform_data bfin_spi_flash_data = { · 23 unmodified lines
518518 static struct bfin5xx_spi_chip spi_flash_chip_info = {
519519 .enable_dma = 0, /* use dma transfer with this chip*/
520520 };
521−#endif
521+#endif /* CONFIG_MTD_M25P80 */
522+#endif /* CONFIG_SPI_BFIN5XX */
522523
523524 #if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE)
524525 #include <linux/spi/ad7879.h>
@@ -535,7 +536,7 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = { · 10 unmodified lines
535536 .gpio_export = 1, /* Export GPIO to gpiolib */
536537 .gpio_base = -1, /* Dynamic allocation */
537538 };
538−#endif
539+#endif /* CONFIG_TOUCHSCREEN_AD7879 */
539540
540541 #if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
541542 #include <asm/bfin-lq035q1.h>
@@ -564,7 +565,7 @@ static struct platform_device bfin_lq035q1_device = { · 22 unmodified lines
564565 .platform_data = &bfin_lq035q1_data,
565566 },
566567 };
567−#endif
568+#endif /* CONFIG_FB_BFIN_LQ035Q1 */
568569
569570 static struct spi_board_info bf538_spi_board_info[] __initdata = {
570571 #if defined(CONFIG_MTD_M25P80) \
@@ -579,7 +580,7 @@ static struct spi_board_info bf538_spi_board_info[] __initdata = { · 8 unmodified lines
579580 .controller_data = &spi_flash_chip_info,
580581 .mode = SPI_MODE_3,
581582 },
582−#endif
583+#endif /* CONFIG_MTD_M25P80 */
583584 #if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)
584585 {
585586 .modalias = "ad7879",
@@ -590,7 +591,7 @@ static struct spi_board_info bf538_spi_board_info[] __initdata = { · 4 unmodified lines
590591 .chip_select = 1,
591592 .mode = SPI_CPHA | SPI_CPOL,
592593 },
593−#endif
594+#endif /* CONFIG_TOUCHSCREEN_AD7879_SPI */
594595 #if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
595596 {
596597 .modalias = "bfin-lq035q1-spi",
@@ -599,7 +600,7 @@ static struct spi_board_info bf538_spi_board_info[] __initdata = { · 2 unmodified lines
599600 .chip_select = 2,
600601 .mode = SPI_CPHA | SPI_CPOL,
601602 },
602−#endif
603+#endif /* CONFIG_FB_BFIN_LQ035Q1 */
603604 #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
604605 {
605606 .modalias = "spidev",
@@ -607,7 +608,7 @@ static struct spi_board_info bf538_spi_board_info[] __initdata = { · 1 unmodified line
607608 .bus_num = 0,
608609 .chip_select = 1,
609610 },
610−#endif
611+#endif /* CONFIG_SPI_SPIDEV */
611612 };
612613
613614 /* SPI (0) */
@@ -716,8 +717,6 @@ static struct platform_device bf538_spi_master2 = { · 102 unmodified lines
716717 },
717718 };
718719
719−#endif /* spi master and devices */
720−
721720 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
722721 static struct resource bfin_twi0_resource[] = {
723722 [0] = {
@@ -759,8 +758,8 @@ static struct platform_device i2c_bfin_twi1_device = { · 35 unmodified lines
759758 .num_resources = ARRAY_SIZE(bfin_twi1_resource),
760759 .resource = bfin_twi1_resource,
761760 };
762−#endif
763−#endif
761+#endif /* CONFIG_BF542 */
762+#endif /* CONFIG_I2C_BLACKFIN_TWI */
764763
765764 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
766765 #include <linux/gpio_keys.h>
arch/powerpc/sysdev/scom.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #include <linux/debugfs.h>
2323 #include <linux/slab.h>
2424 #include <linux/export.h>
25+#include <asm/debug.h>
2526 #include <asm/prom.h>
2627 #include <asm/scom.h>
2728
arch/xtensa/include/asm/hardirq.h+0−3
@@ -11,9 +11,6 @@ · 10 unmodified lines
1111 #ifndef _XTENSA_HARDIRQ_H
1212 #define _XTENSA_HARDIRQ_H
1313
14−void ack_bad_irq(unsigned int irq);
15−#define ack_bad_irq ack_bad_irq
16−
1714 #include <asm-generic/hardirq.h>
1815
1916 #endif /* _XTENSA_HARDIRQ_H */
arch/xtensa/include/asm/io.h+1−0
@@ -14,6 +14,7 @@ · 13 unmodified lines
1414 #ifdef __KERNEL__
1515 #include <asm/byteorder.h>
1616 #include <asm/page.h>
17+#include <linux/bug.h>
1718 #include <linux/kernel.h>
1819
1920 #include <linux/types.h>
arch/xtensa/kernel/signal.c+1−0
@@ -496,6 +496,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) · 495 unmodified lines
496496 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
497497
498498 if (signr > 0) {
499+ int ret;
499500
500501 /* Are we from a system call? */
501502
drivers/pci/Makefile+1−0
@@ -42,6 +42,7 @@ obj-$(CONFIG_UNICORE32) += setup-bus.o setup-irq.o · 41 unmodified lines
4242 obj-$(CONFIG_PARISC) += setup-bus.o
4343 obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o
4444 obj-$(CONFIG_PPC) += setup-bus.o
45+obj-$(CONFIG_FRV) += setup-bus.o
4546 obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
4647 obj-$(CONFIG_X86_VISWS) += setup-irq.o
4748 obj-$(CONFIG_MN10300) += setup-bus.o
drivers/video/bfin-lq035q1-fb.c+1−0
@@ -13,6 +13,7 @@ · 12 unmodified lines
1313 #include <linux/errno.h>
1414 #include <linux/string.h>
1515 #include <linux/fb.h>
16+#include <linux/gpio.h>
1617 #include <linux/slab.h>
1718 #include <linux/init.h>
1819 #include <linux/types.h>
kernel/irq/debug.h+19−19
@@ -4,10 +4,10 @@ · 3 unmodified lines
44
55 #include <linux/kallsyms.h>
66
7−#define P(f) if (desc->status_use_accessors & f) printk("%14s set\n", #f)
8−#define PS(f) if (desc->istate & f) printk("%14s set\n", #f)
7+#define ___P(f) if (desc->status_use_accessors & f) printk("%14s set\n", #f)
8+#define ___PS(f) if (desc->istate & f) printk("%14s set\n", #f)
99 /* FIXME */
10−#define PD(f) do { } while (0)
10+#define ___PD(f) do { } while (0)
1111
1212 static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
1313 {
@@ -23,23 +23,23 @@ static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc) · 9 unmodified lines
2323 print_symbol("%s\n", (unsigned long)desc->action->handler);
2424 }
2525
26− P(IRQ_LEVEL);
27− P(IRQ_PER_CPU);
28− P(IRQ_NOPROBE);
29− P(IRQ_NOREQUEST);
30− P(IRQ_NOTHREAD);
31− P(IRQ_NOAUTOEN);
26+ ___P(IRQ_LEVEL);
27+ ___P(IRQ_PER_CPU);
28+ ___P(IRQ_NOPROBE);
29+ ___P(IRQ_NOREQUEST);
30+ ___P(IRQ_NOTHREAD);
31+ ___P(IRQ_NOAUTOEN);
3232
33− PS(IRQS_AUTODETECT);
34− PS(IRQS_REPLAY);
35− PS(IRQS_WAITING);
36− PS(IRQS_PENDING);
33+ ___PS(IRQS_AUTODETECT);
34+ ___PS(IRQS_REPLAY);
35+ ___PS(IRQS_WAITING);
36+ ___PS(IRQS_PENDING);
3737
38− PD(IRQS_INPROGRESS);
39− PD(IRQS_DISABLED);
40− PD(IRQS_MASKED);
38+ ___PD(IRQS_INPROGRESS);
39+ ___PD(IRQS_DISABLED);
40+ ___PD(IRQS_MASKED);
4141 }
4242
43−#undef P
44−#undef PS
45−#undef PD
43+#undef ___P
44+#undef ___PS
45+#undef ___PD

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t