diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 21:43:08 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 21:43:08 +0400 |
commit | f4e385ccfc10f44364101b126d1ac52b4c806f1d (patch) | |
tree | 05b8d1c55900e46d034cf11809ef9990ec48cdae /arch/s390/mm/init.c | |
parent | 32e2f63bcc8903487975506d8db5931a8c4bbb1f (diff) | |
parent | 050eef364ad700590a605a0749f825cab4834b1e (diff) | |
download | linux-f4e385ccfc10f44364101b126d1ac52b4c806f1d.tar.xz |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] fix tlb flushing vs. concurrent /proc accesses
[S390] s390: fix build error (sys_execve)
Diffstat (limited to 'arch/s390/mm/init.c')
-rw-r--r-- | arch/s390/mm/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index acc91c75bc94..30eb6d02ddb8 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -74,6 +74,8 @@ void __init paging_init(void) __ctl_load(S390_lowcore.kernel_asce, 13, 13); __raw_local_irq_ssm(ssm_mask); + atomic_set(&init_mm.context.attach_count, 1); + sparse_memory_present_with_active_regions(MAX_NUMNODES); sparse_init(); memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); |