diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 04:43:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 04:43:55 +0200 |
| commit | 04012e3076943f17c8cfc77a196701c8f0b8964f (patch) | |
| tree | 1f516b94814fd5a55abbaae6f64c295c592853bc /include | |
| parent | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux (diff) | |
| parent | EDAC: Fix lockdep splat (diff) | |
| download | linux-04012e3076943f17c8cfc77a196701c8f0b8964f.tar.xz linux-04012e3076943f17c8cfc77a196701c8f0b8964f.zip | |
Merge tag 'please-pull-bp-edac' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fix from Tony Luck:
"Fix EDAC lockdep splat"
* tag 'please-pull-bp-edac' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
EDAC: Fix lockdep splat
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/edac.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/edac.h b/include/linux/edac.h index 0b763276f619..5c6d7fbaf89e 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h @@ -622,7 +622,7 @@ struct edac_raw_error_desc { */ struct mem_ctl_info { struct device dev; - struct bus_type bus; + struct bus_type *bus; struct list_head link; /* for global list of mem_ctl_info structs */ @@ -742,4 +742,9 @@ struct mem_ctl_info { #endif }; +/* + * Maximum number of memory controllers in the coherent fabric. + */ +#define EDAC_MAX_MCS 16 + #endif |