diff options
author | Pekka Paalanen <pq@iki.fi> | 2008-05-12 15:21:14 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-24 05:27:47 -0400 |
commit | 790e2a290b499b0400254e6870ec27969065d122 (patch) | |
tree | 0c6b0e7d6b0db645e84c9dbb54ccab428f3d74a8 /arch/x86 | |
parent | a50445d76c22a34ae149704ea5adaef171c8acb7 (diff) |
x86 mmiotrace: page level is unsigned
Fixes some sparse warnings.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/mm/kmmio.c | 13 | ||||
-rw-r--r-- | arch/x86/mm/mmio-mod.c | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c index 93b1797666cb..b65871e6bba6 100644 --- a/arch/x86/mm/kmmio.c +++ b/arch/x86/mm/kmmio.c | |||
@@ -104,11 +104,12 @@ static struct kmmio_fault_page *get_kmmio_fault_page(unsigned long page) | |||
104 | return NULL; | 104 | return NULL; |
105 | } | 105 | } |
106 | 106 | ||
107 | static void set_page_present(unsigned long addr, bool present, int *pglevel) | 107 | static void set_page_present(unsigned long addr, bool present, |
108 | unsigned int *pglevel) | ||
108 | { | 109 | { |
109 | pteval_t pteval; | 110 | pteval_t pteval; |
110 | pmdval_t pmdval; | 111 | pmdval_t pmdval; |
111 | int level; | 112 | unsigned int level; |
112 | pmd_t *pmd; | 113 | pmd_t *pmd; |
113 | pte_t *pte = lookup_address(addr, &level); | 114 | pte_t *pte = lookup_address(addr, &level); |
114 | 115 | ||
@@ -145,15 +146,15 @@ static void set_page_present(unsigned long addr, bool present, int *pglevel) | |||
145 | } | 146 | } |
146 | 147 | ||
147 | /** Mark the given page as not present. Access to it will trigger a fault. */ | 148 | /** Mark the given page as not present. Access to it will trigger a fault. */ |
148 | static void arm_kmmio_fault_page(unsigned long page, int *page_level) | 149 | static void arm_kmmio_fault_page(unsigned long page, unsigned int *pglevel) |
149 | { | 150 | { |
150 | set_page_present(page & PAGE_MASK, false, page_level); | 151 | set_page_present(page & PAGE_MASK, false, pglevel); |
151 | } | 152 | } |
152 | 153 | ||
153 | /** Mark the given page as present. */ | 154 | /** Mark the given page as present. */ |
154 | static void disarm_kmmio_fault_page(unsigned long page, int *page_level) | 155 | static void disarm_kmmio_fault_page(unsigned long page, unsigned int *pglevel) |
155 | { | 156 | { |
156 | set_page_present(page & PAGE_MASK, true, page_level); | 157 | set_page_present(page & PAGE_MASK, true, pglevel); |
157 | } | 158 | } |
158 | 159 | ||
159 | /* | 160 | /* |
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c index ed0e0e90b3ef..e7397e108beb 100644 --- a/arch/x86/mm/mmio-mod.c +++ b/arch/x86/mm/mmio-mod.c | |||
@@ -137,7 +137,7 @@ static ssize_t write_marker(struct file *file, const char __user *buffer, | |||
137 | 137 | ||
138 | static void print_pte(unsigned long address) | 138 | static void print_pte(unsigned long address) |
139 | { | 139 | { |
140 | int level; | 140 | unsigned int level; |
141 | pte_t *pte = lookup_address(address, &level); | 141 | pte_t *pte = lookup_address(address, &level); |
142 | 142 | ||
143 | if (!pte) { | 143 | if (!pte) { |