Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)

2 files changed, 20 insertions, 12 deletions

diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
index a5da732fe5b2..4184e0171f00 100644
--- a/drivers/edac/i82975x_edac.c
+++ b/drivers/edac/i82975x_edac.c
@@ -277,11 +277,9 @@ static void i82975x_get_error_info(struct mem_ctl_info *mci,
 static int i82975x_process_error_info(struct mem_ctl_info *mci,
                 struct i82975x_error_info *info, int handle_errors)
 {
-        int row, multi_chan, chan;
+        int row, chan;
         unsigned long offst, page;
 
-        multi_chan = mci->csrows[0].nr_channels - 1;
-
         if (!(info->errsts2 & 0x0003))
                 return 0;
 
@@ -294,20 +292,30 @@ static int i82975x_process_error_info(struct mem_ctl_info *mci,
         }
 
         page = (unsigned long) info->eap;
-        if (info->xeap & 1)
-                page |= 0x100000000ul;
-        chan = page & 1;
         page >>= 1;
-        offst = page & ((1 << PAGE_SHIFT) - 1);
-        page >>= PAGE_SHIFT;
+        if (info->xeap & 1)
+                page |= 0x80000000;
+        page >>= (PAGE_SHIFT - 1);
         row = edac_mc_find_csrow_by_page(mci, page);
 
+        if (row == -1)  {
+                i82975x_mc_printk(mci, KERN_ERR, "error processing EAP:\n"
+                        "\tXEAP=%u\n"
+                        "\t EAP=0x%08x\n"
+                        "\tPAGE=0x%08x\n",
+                        (info->xeap & 1) ? 1 : 0, info->eap, (unsigned int) page);
+                return 0;
+        }
+        chan = (mci->csrows[row].nr_channels == 1) ? 0 : info->eap & 1;
+        offst = info->eap
+                        & ((1 << PAGE_SHIFT) -
+                                (1 << mci->csrows[row].grain));
+
         if (info->errsts & 0x0002)
                 edac_mc_handle_ue(mci, page, offst , row, "i82975x UE");
         else
                 edac_mc_handle_ce(mci, page, offst, info->derrsyn, row,
-                                multi_chan ? chan : 0,
-                                "i82975x CE");
+                                chan, "i82975x CE");
 
         return 1;
 }
@@ -410,7 +418,7 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
                 csrow->last_page = cumul_size - 1;
                 csrow->nr_pages = cumul_size - last_cumul_size;
                 last_cumul_size = cumul_size;
-                csrow->grain = 1 << 6;  /* I82975X_EAP has 64B resolution */
+                csrow->grain = 1 << 7;  /* 128Byte cache-line resolution */
                 csrow->mtype = MEM_DDR2; /* I82975x supports only DDR2 */
                 csrow->dtype = i82975x_dram_type(mch_window, index);
                 csrow->edac_mode = EDAC_SECDED; /* only supported */
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 38400963e245..fc757069c6af 100644
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -142,7 +142,7 @@
 
 /*
  * The ibm,sdram-4xx-ddr2 Device Control Registers (DCRs) are
- * indirectly acccessed and have a base and length defined by the
+ * indirectly accessed and have a base and length defined by the
  * device tree. The base can be anything; however, we expect the
  * length to be precisely two registers, the first for the address
  * window and the second for the data window.