git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
i386
/
mm
/
init.c
diff --git
a/arch/i386/mm/init.c
b/arch/i386/mm/init.c
index
1674161
..
84697df
100644
(file)
--- a/
arch/i386/mm/init.c
+++ b/
arch/i386/mm/init.c
@@
-192,8
+192,6
@@
static inline int page_kills_ppro(unsigned long pagenr)
return 0;
}
return 0;
}
-extern int is_available_memory(efi_memory_desc_t *);
-
int page_is_ram(unsigned long pagenr)
{
int i;
int page_is_ram(unsigned long pagenr)
{
int i;
@@
-699,8
+697,8
@@
int remove_memory(u64 start, u64 size)
#endif
#endif
#endif
#endif
-
kmem_cache_t
*pgd_cache;
-
kmem_cache_t
*pmd_cache;
+
struct kmem_cache
*pgd_cache;
+
struct kmem_cache
*pmd_cache;
void __init pgtable_cache_init(void)
{
void __init pgtable_cache_init(void)
{