diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /include/asm-blackfin/mmu_context.h | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'include/asm-blackfin/mmu_context.h')
| -rw-r--r-- | include/asm-blackfin/mmu_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-blackfin/mmu_context.h b/include/asm-blackfin/mmu_context.h index b5eb67596ad5..f55ec3c23a92 100644 --- a/include/asm-blackfin/mmu_context.h +++ b/include/asm-blackfin/mmu_context.h | |||
| @@ -73,7 +73,7 @@ static inline void destroy_context(struct mm_struct *mm) | |||
| 73 | struct sram_list_struct *tmp; | 73 | struct sram_list_struct *tmp; |
| 74 | 74 | ||
| 75 | if (current_l1_stack_save == mm->context.l1_stack_save) | 75 | if (current_l1_stack_save == mm->context.l1_stack_save) |
| 76 | current_l1_stack_save = 0; | 76 | current_l1_stack_save = NULL; |
| 77 | if (mm->context.l1_stack_save) | 77 | if (mm->context.l1_stack_save) |
| 78 | free_l1stack(); | 78 | free_l1stack(); |
| 79 | 79 | ||