diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /arch/cris/include/asm/pgtable.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'arch/cris/include/asm/pgtable.h')
| -rw-r--r-- | arch/cris/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/include/asm/pgtable.h b/arch/cris/include/asm/pgtable.h index 9eaae217b21b..7df430138355 100644 --- a/arch/cris/include/asm/pgtable.h +++ b/arch/cris/include/asm/pgtable.h | |||
| @@ -97,7 +97,7 @@ extern unsigned long empty_zero_page; | |||
| 97 | #define pte_clear(mm,addr,xp) do { pte_val(*(xp)) = 0; } while (0) | 97 | #define pte_clear(mm,addr,xp) do { pte_val(*(xp)) = 0; } while (0) |
| 98 | 98 | ||
| 99 | #define pmd_none(x) (!pmd_val(x)) | 99 | #define pmd_none(x) (!pmd_val(x)) |
| 100 | /* by removing the _PAGE_KERNEL bit from the comparision, the same pmd_bad | 100 | /* by removing the _PAGE_KERNEL bit from the comparison, the same pmd_bad |
| 101 | * works for both _PAGE_TABLE and _KERNPG_TABLE pmd entries. | 101 | * works for both _PAGE_TABLE and _KERNPG_TABLE pmd entries. |
| 102 | */ | 102 | */ |
| 103 | #define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_KERNEL)) != _PAGE_TABLE) | 103 | #define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_KERNEL)) != _PAGE_TABLE) |