diff options
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/patches-3.7/025-bcma_backport.patch | 8 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.7/203-kallsyms_uncompressed.patch | 12 |
2 files changed, 9 insertions, 11 deletions
diff --git a/target/linux/generic/patches-3.7/025-bcma_backport.patch b/target/linux/generic/patches-3.7/025-bcma_backport.patch index fa0ff31618..4bd1b11f39 100644 --- a/target/linux/generic/patches-3.7/025-bcma_backport.patch +++ b/target/linux/generic/patches-3.7/025-bcma_backport.patch @@ -734,17 +734,15 @@ } EXPORT_SYMBOL(bcma_core_mips_irq); -@@ -114,8 +121,8 @@ static void bcma_core_mips_set_irq(struc +@@ -114,7 +121,7 @@ static void bcma_core_mips_set_irq(struc bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0), bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) & ~(1 << irqflag)); - else -- bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq), 0); + else if (oldirq != 5) -+ bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0); + bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0); /* assign the new one */ - if (irq == 0) { @@ -123,9 +130,9 @@ static void bcma_core_mips_set_irq(struc bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) | (1 << irqflag)); @@ -1357,7 +1355,7 @@ #endif /* LINUX_BCMA_REGS_H_ */ --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -4656,7 +4656,7 @@ static int b43_wireless_core_init(struct +@@ -4684,7 +4684,7 @@ static int b43_wireless_core_init(struct switch (dev->dev->bus_type) { #ifdef CONFIG_B43_BCMA case B43_BUS_BCMA: diff --git a/target/linux/generic/patches-3.7/203-kallsyms_uncompressed.patch b/target/linux/generic/patches-3.7/203-kallsyms_uncompressed.patch index 57655aae23..c3da46c076 100644 --- a/target/linux/generic/patches-3.7/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/patches-3.7/203-kallsyms_uncompressed.patch @@ -1,6 +1,6 @@ --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c -@@ -83,6 +83,7 @@ static struct text_range text_ranges[] = +@@ -54,6 +54,7 @@ static struct text_range text_ranges[] = static struct sym_entry *table; static unsigned int table_size, table_cnt; static int all_symbols = 0; @@ -8,7 +8,7 @@ static char symbol_prefix_char = '\0'; int token_profit[0x10000]; -@@ -389,6 +390,9 @@ static void write_src(void) +@@ -360,6 +361,9 @@ static void write_src(void) free(markers); @@ -18,7 +18,7 @@ output_label("kallsyms_token_table"); off = 0; for (i = 0; i < 256; i++) { -@@ -447,6 +451,9 @@ static void *find_token(unsigned char *s +@@ -418,6 +422,9 @@ static void *find_token(unsigned char *s { int i; @@ -28,7 +28,7 @@ for (i = 0; i < len - 1; i++) { if (str[i] == token[0] && str[i+1] == token[1]) return &str[i]; -@@ -519,6 +526,9 @@ static void optimize_result(void) +@@ -490,6 +497,9 @@ static void optimize_result(void) { int i, best; @@ -38,7 +38,7 @@ /* using the '\0' symbol last allows compress_symbols to use standard * fast string functions */ for (i = 255; i >= 0; i--) { -@@ -675,7 +685,9 @@ int main(int argc, char **argv) +@@ -646,7 +656,9 @@ int main(int argc, char **argv) if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\'')) p++; symbol_prefix_char = *p; @@ -51,7 +51,7 @@ } else if (argc != 1) --- a/init/Kconfig +++ b/init/Kconfig -@@ -1198,6 +1198,17 @@ config KALLSYMS_ALL +@@ -1194,6 +1194,17 @@ config KALLSYMS_ALL Say N unless you really need all symbols. |