diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 15:22:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 15:22:12 -0400 |
| commit | fb7a0e36532bc231bea8adfb1dddc3961eb38940 (patch) | |
| tree | 82cb74383809668d6d92a5124fc60d11b35c8d6e /include | |
| parent | 4e93d3e8859c834ee18dfd33051d24df8669d0c0 (diff) | |
| parent | 29516d75a0b09e0a0328dd55c98a342515c9615a (diff) | |
Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
Do arch/ia64/defconfig by hand.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/efi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 047e7222df7a..73781ec165b4 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h | |||
| @@ -315,7 +315,7 @@ extern struct efi_memory_map memmap; | |||
| 315 | */ | 315 | */ |
| 316 | static inline int efi_range_is_wc(unsigned long start, unsigned long len) | 316 | static inline int efi_range_is_wc(unsigned long start, unsigned long len) |
| 317 | { | 317 | { |
| 318 | int i; | 318 | unsigned long i; |
| 319 | 319 | ||
| 320 | for (i = 0; i < len; i += (1UL << EFI_PAGE_SHIFT)) { | 320 | for (i = 0; i < len; i += (1UL << EFI_PAGE_SHIFT)) { |
| 321 | unsigned long paddr = __pa(start + i); | 321 | unsigned long paddr = __pa(start + i); |