Commit eda7aa60 authored by Linus Torvalds's avatar Linus Torvalds

Merge http://lia64.bkbits.net/to-linus-2.5

into home.osdl.org:/home/torvalds/v2.5/linux
parents ec004d58 25e6bed8
......@@ -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;
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment