diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-11-10 02:42:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-11-10 02:42:47 -0800 |
| commit | eda7aa6072f55de77b9ed085e29e4fa4f41d0349 (patch) | |
| tree | 66b9f8f72c2f539796acdef1db70296a902de7d6 | |
| parent | ec004d589f9f5ddcafa1cac004f8911b5af6e1c7 (diff) | |
| parent | 25e6bed894367f3904ff90a5a20adf1a313cb90c (diff) | |
Merge http://lia64.bkbits.net/to-linus-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
| -rw-r--r-- | arch/ia64/kernel/irq.c | 2 | ||||
| -rw-r--r-- | include/asm-ia64/pgtable.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index 471bb733efbc..f9601ef77d01 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c @@ -1039,7 +1039,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, if (count < HEX_DIGITS+1) return -EINVAL; - for (k = 0; k < sizeof(cpumask_t)/sizeof(unsigned long); ++k) { + for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) { int j = sprintf(page, "%04hx", (u16)cpus_coerce(*mask)); len += j; page += j; diff --git a/include/asm-ia64/pgtable.h b/include/asm-ia64/pgtable.h index 6f8d7c9287ba..d66484178294 100644 --- a/include/asm-ia64/pgtable.h +++ b/include/asm-ia64/pgtable.h @@ -63,8 +63,8 @@ #define _PAGE_FILE (1 << 1) /* see swap & file pte remarks below */ #define _PFN_MASK _PAGE_PPN_MASK -/* Mask of bits which may be changed by pte_modify(): */ -#define _PAGE_CHG_MASK _PAGE_AR_MASK +/* Mask of bits which may be changed by pte_modify(); the odd bits are there for _PAGE_PROTNONE */ +#define _PAGE_CHG_MASK (_PAGE_P | _PAGE_PROTNONE | _PAGE_PL_MASK | _PAGE_AR_MASK | _PAGE_ED) #define _PAGE_SIZE_4K 12 #define _PAGE_SIZE_8K 13 |