diff options
| author | Linus Torvalds | 2006-07-12 17:30:57 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-07-12 17:30:57 +0200 |
| commit | b2d6744849b5bf6b4593b81c136772df7a238ac9 (patch) | |
| tree | f27260a0b16412449c4205207af114646c29e2c4 /arch/s390/kernel/profile.c | |
| parent | Add PIIX4 APCI quirk for the 440MX chipset too (diff) | |
| parent | [S390] Fix sparse warnings. (diff) | |
| download | kernel-qcow2-linux-b2d6744849b5bf6b4593b81c136772df7a238ac9.tar.gz kernel-qcow2-linux-b2d6744849b5bf6b4593b81c136772df7a238ac9.tar.xz kernel-qcow2-linux-b2d6744849b5bf6b4593b81c136772df7a238ac9.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Fix sparse warnings.
[S390] path grouping and path verifications fixes.
[S390] xpram module parameter parsing.
[S390] cpu_relax() is supposed to have barrier() semantics.
[S390] fix futex_atomic_cmpxchg_inatomic
[S390] subchannel register/unregister mutex.
[S390] raw_local_save_flags/raw_local_irq_restore type check
[S390] __builtin_trap() and gcc version.
Diffstat (limited to 'arch/s390/kernel/profile.c')
| -rw-r--r-- | arch/s390/kernel/profile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/profile.c b/arch/s390/kernel/profile.c index 7ba777eec1a8..b81aa1f569ca 100644 --- a/arch/s390/kernel/profile.c +++ b/arch/s390/kernel/profile.c @@ -13,7 +13,7 @@ static struct proc_dir_entry * root_irq_dir; void init_irq_proc(void) { /* create /proc/irq */ - root_irq_dir = proc_mkdir("irq", 0); + root_irq_dir = proc_mkdir("irq", NULL); /* create /proc/irq/prof_cpu_mask */ create_prof_cpu_mask(root_irq_dir); |