Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
- Fix a flood of annoying build warnings
- A number of fixes for Atheros 79xx platforms
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: ath79: Add a machine entry for booting OF machines
MIPS: ath79: Fix the size of the MISC INTC registers in ar9132.dtsi
MIPS: ath79: Fix the DDR control initialization on ar71xx and ar934x
MIPS: Fix flood of warnings about comparsion being always true.
+9
-3
+6
-1
arch/mips/ath79/setup.c
+6
-1
arch/mips/ath79/setup.c
···
216
216
AR71XX_RESET_SIZE);
217
217
ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE,
218
218
AR71XX_PLL_SIZE);
219
+
ath79_detect_sys_type();
219
220
ath79_ddr_ctrl_init();
220
221
221
-
ath79_detect_sys_type();
222
222
if (mips_machtype != ATH79_MACH_GENERIC_OF)
223
223
detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX);
224
224
···
281
281
"Generic",
282
282
"Generic AR71XX/AR724X/AR913X based board",
283
283
ath79_generic_init);
284
+
285
+
MIPS_MACHINE(ATH79_MACH_GENERIC_OF,
286
+
"DTB",
287
+
"Generic AR71XX/AR724X/AR913X based board (DT)",
288
+
NULL);
+1
-1
arch/mips/boot/dts/qca/ar9132.dtsi
+1
-1
arch/mips/boot/dts/qca/ar9132.dtsi
+2
-1
arch/mips/include/asm/page.h
+2
-1
arch/mips/include/asm/page.h
···
200
200
{
201
201
/* avoid <linux/mm.h> include hell */
202
202
extern unsigned long max_mapnr;
203
+
unsigned long pfn_offset = ARCH_PFN_OFFSET;
203
204
204
-
return pfn >= ARCH_PFN_OFFSET && pfn < max_mapnr;
205
+
return pfn >= pfn_offset && pfn < max_mapnr;
205
206
}
206
207
207
208
#elif defined(CONFIG_SPARSEMEM)