Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fixe the definition of PTRS_PER_PGD
[MIPS] au1000: Fix gpio direction
+4
-2
+3
-1
arch/mips/au1000/common/gpio.c
+3
-1
arch/mips/au1000/common/gpio.c
···
61
61
static int au1xxx_gpio2_direction_output(unsigned gpio, int value)
62
62
{
63
63
gpio -= AU1XXX_GPIO_BASE;
64
-
gpio2->dir = (0x01 << gpio) | (value << gpio);
64
+
gpio2->dir |= 0x01 << gpio;
65
+
gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << gpio) | (value << gpio);
65
66
return 0;
66
67
}
67
68
···
91
90
static int au1xxx_gpio1_direction_output(unsigned gpio, int value)
92
91
{
93
92
gpio1->trioutclr = (0x01 & gpio);
93
+
au1xxx_gpio1_write(gpio, value);
94
94
return 0;
95
95
}
96
96
+1
-1
include/asm-mips/pgtable-32.h
+1
-1
include/asm-mips/pgtable-32.h
···
57
57
#define PMD_ORDER 1
58
58
#define PTE_ORDER 0
59
59
60
-
#define PTRS_PER_PGD ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t))
60
+
#define PTRS_PER_PGD (USER_PTRS_PER_PGD * 2)
61
61
#define PTRS_PER_PTE ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t))
62
62
63
63
#define USER_PTRS_PER_PGD (0x80000000UL/PGDIR_SIZE)