xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into for-2.6.33

Browse Source
This commit is contained in:
Jens Axboe
2009-12-03 13:49:39 +01:00
parent 474b18ccc2 22763c5cf3
commit 220d0b1dbf
966 changed files with 15377 additions and 7229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/powerpc/include/asm/kmap_types.h
View File

@@ -29,5 +29,16 @@ enum km_type {
KM_TYPE_NR
};
/*
* This is a temporary build fix that (so they say on lkml....) should no longer
* be required after 2.6.33, because of changes planned to the kmap code.
* Let's try to remove this cruft then.
*/
#ifdef CONFIG_DEBUG_HIGHMEM
#define KM_NMI (-1)
#define KM_NMI_PTE (-1)
#define KM_IRQ_PTE (-1)
#endif
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_KMAP_TYPES_H */