Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 307608
b: refs/heads/master
c: a6527b9
h: refs/heads/master
v: v3
  • Loading branch information
Anna-Maria Gleixner authored and Thomas Gleixner committed May 21, 2012
1 parent bdf4591 commit 38c55ea
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5bf8f6bfc950abe23927e0ff54cdb260d19d608e
refs/heads/master: a6527b92e40f48b29c31be911c3d62eec484cf70
12 changes: 3 additions & 9 deletions trunk/arch/s390/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ config ARCH_HAS_ILOG2_U64
config GENERIC_HWEIGHT
def_bool y

config GENERIC_TIME_VSYSCALL
def_bool y

config GENERIC_CLOCKEVENTS
def_bool y

config GENERIC_BUG
def_bool y if BUG

Expand Down Expand Up @@ -122,6 +116,9 @@ config S390
select ARCH_INLINE_WRITE_UNLOCK_BH
select ARCH_INLINE_WRITE_UNLOCK_IRQ
select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
select GENERIC_TIME_VSYSCALL
select GENERIC_CLOCKEVENTS
select KTIME_SCALAR if 32BIT

config SCHED_OMIT_FRAME_POINTER
def_bool y
Expand All @@ -146,9 +143,6 @@ config 64BIT
config 32BIT
def_bool y if !64BIT

config KTIME_SCALAR
def_bool 32BIT

config SMP
def_bool y
prompt "Symmetric multi-processing support"
Expand Down

0 comments on commit 38c55ea

Please sign in to comment.