diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-01 05:11:07 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-01 05:11:07 -0500 |
| commit | e87a3dd33eab30b4db539500064a9584867e4f2c (patch) | |
| tree | 2f7ad16e46ae30518ff63bb5391b63f7f7cc74dd /kernel/lockdep.c | |
| parent | b14f5de731ae657d498d18d713c6431bfbeefb4b (diff) | |
| parent | 3d00941371a765779c4e3509214c7e5793cce1fe (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'kernel/lockdep.c')
| -rw-r--r-- | kernel/lockdep.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index f74d2d7aa605..3815ac1d58b2 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
| @@ -578,6 +578,9 @@ static int static_obj(void *obj) | |||
| 578 | if ((addr >= start) && (addr < end)) | 578 | if ((addr >= start) && (addr < end)) |
| 579 | return 1; | 579 | return 1; |
| 580 | 580 | ||
| 581 | if (arch_is_kernel_data(addr)) | ||
| 582 | return 1; | ||
| 583 | |||
| 581 | #ifdef CONFIG_SMP | 584 | #ifdef CONFIG_SMP |
| 582 | /* | 585 | /* |
| 583 | * percpu var? | 586 | * percpu var? |