]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
amd64_edac: rename StinkyIdentifier
authorBorislav Petkov <borislav.petkov@amd.com>
Mon, 26 Oct 2009 14:00:19 +0000 (15:00 +0100)
committerBorislav Petkov <borislav.petkov@amd.com>
Mon, 7 Dec 2009 18:14:30 +0000 (19:14 +0100)
SystemAddress -> sys_addr

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
drivers/edac/amd64_edac.c

index 86742aaa5e55f21f749d82f38482c4a3916bd46f..202f08e543e366b77cc7c88c20aa49dbc45a6259 100644 (file)
@@ -1117,7 +1117,7 @@ static void k8_read_dram_base_limit(struct amd64_pvt *pvt, int dram)
 
 static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci,
                                        struct err_regs *info,
-                                       u64 SystemAddress)
+                                       u64 sys_addr)
 {
        struct mem_ctl_info *src_mci;
        unsigned short syndrome;
@@ -1152,28 +1152,28 @@ static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci,
                 * was obtained from email communication with someone at AMD.
                 * (Wish the email was placed in this comment - norsk)
                 */
-               channel = ((SystemAddress & BIT(3)) != 0);
+               channel = ((sys_addr & BIT(3)) != 0);
        }
 
        /*
         * Find out which node the error address belongs to. This may be
         * different from the node that detected the error.
         */
-       src_mci = find_mc_by_sys_addr(mci, SystemAddress);
+       src_mci = find_mc_by_sys_addr(mci, sys_addr);
        if (!src_mci) {
                amd64_mc_printk(mci, KERN_ERR,
                             "failed to map error address 0x%lx to a node\n",
-                            (unsigned long)SystemAddress);
+                            (unsigned long)sys_addr);
                edac_mc_handle_ce_no_info(mci, EDAC_MOD_STR);
                return;
        }
 
-       /* Now map the SystemAddress to a CSROW */
-       csrow = sys_addr_to_csrow(src_mci, SystemAddress);
+       /* Now map the sys_addr to a CSROW */
+       csrow = sys_addr_to_csrow(src_mci, sys_addr);
        if (csrow < 0) {
                edac_mc_handle_ce_no_info(src_mci, EDAC_MOD_STR);
        } else {
-               error_address_to_page_and_offset(SystemAddress, &page, &offset);
+               error_address_to_page_and_offset(sys_addr, &page, &offset);
 
                edac_mc_handle_ce(src_mci, page, offset, syndrome, csrow,
                                  channel, EDAC_MOD_STR);
@@ -2108,7 +2108,7 @@ static void amd64_handle_ce(struct mem_ctl_info *mci,
                            struct err_regs *info)
 {
        struct amd64_pvt *pvt = mci->pvt_info;
-       u64 SystemAddress;
+       u64 sys_addr;
 
        /* Ensure that the Error Address is VALID */
        if ((info->nbsh & K8_NBSH_VALID_ERROR_ADDR) == 0) {
@@ -2118,12 +2118,12 @@ static void amd64_handle_ce(struct mem_ctl_info *mci,
                return;
        }
 
-       SystemAddress = extract_error_address(mci, info);
+       sys_addr = extract_error_address(mci, info);
 
        amd64_mc_printk(mci, KERN_ERR,
-               "CE ERROR_ADDRESS= 0x%llx\n", SystemAddress);
+               "CE ERROR_ADDRESS= 0x%llx\n", sys_addr);
 
-       pvt->ops->map_sysaddr_to_csrow(mci, info, SystemAddress);
+       pvt->ops->map_sysaddr_to_csrow(mci, info, sys_addr);
 }
 
 /* Handle any Un-correctable Errors (UEs) */
@@ -2131,7 +2131,7 @@ static void amd64_handle_ue(struct mem_ctl_info *mci,
                            struct err_regs *info)
 {
        int csrow;
-       u64 SystemAddress;
+       u64 sys_addr;
        u32 page, offset;
        struct mem_ctl_info *log_mci, *src_mci = NULL;
 
@@ -2144,31 +2144,31 @@ static void amd64_handle_ue(struct mem_ctl_info *mci,
                return;
        }
 
-       SystemAddress = extract_error_address(mci, info);
+       sys_addr = extract_error_address(mci, info);
 
        /*
         * Find out which node the error address belongs to. This may be
         * different from the node that detected the error.
         */
-       src_mci = find_mc_by_sys_addr(mci, SystemAddress);
+       src_mci = find_mc_by_sys_addr(mci, sys_addr);
        if (!src_mci) {
                amd64_mc_printk(mci, KERN_CRIT,
                        "ERROR ADDRESS (0x%lx) value NOT mapped to a MC\n",
-                       (unsigned long)SystemAddress);
+                       (unsigned long)sys_addr);
                edac_mc_handle_ue_no_info(log_mci, EDAC_MOD_STR);
                return;
        }
 
        log_mci = src_mci;
 
-       csrow = sys_addr_to_csrow(log_mci, SystemAddress);
+       csrow = sys_addr_to_csrow(log_mci, sys_addr);
        if (csrow < 0) {
                amd64_mc_printk(mci, KERN_CRIT,
                        "ERROR_ADDRESS (0x%lx) value NOT mapped to 'csrow'\n",
-                       (unsigned long)SystemAddress);
+                       (unsigned long)sys_addr);
                edac_mc_handle_ue_no_info(log_mci, EDAC_MOD_STR);
        } else {
-               error_address_to_page_and_offset(SystemAddress, &page, &offset);
+               error_address_to_page_and_offset(sys_addr, &page, &offset);
                edac_mc_handle_ue(log_mci, page, offset, csrow, EDAC_MOD_STR);
        }
 }