109 lines
3.3 KiB
Diff
109 lines
3.3 KiB
Diff
diff -urN ppc64-diag-2.4.2/diags/7031_D24_T24.c ppc64-diag-2.4.2_/diags/7031_D24_T24.c
|
|
--- ppc64-diag-2.4.2/diags/7031_D24_T24.c 2009-05-21 23:33:06.000000000 +0200
|
|
+++ ppc64-diag-2.4.2_/diags/7031_D24_T24.c 2012-02-15 18:36:47.170113915 +0100
|
|
@@ -64,7 +64,8 @@
|
|
static int
|
|
print_drive_status(uint32_t status)
|
|
{
|
|
- int fail = 0, printed = 0, rc = OK;
|
|
+ __attribute__((unused)) int fail = 0;
|
|
+ int printed = 0, rc = OK;
|
|
|
|
if ((status & 0x0F000000) == 0x05000000) {
|
|
printf("(empty) ");
|
|
@@ -162,7 +163,8 @@
|
|
static int
|
|
print_repeater_status(uint32_t status)
|
|
{
|
|
- int printed = 0, fail = 0, rc = OK;
|
|
+ int printed = 0, rc = OK;
|
|
+ __attribute__((unused)) int fail = 0;
|
|
|
|
if ((status & 0x0F000000) == 0x01000000)
|
|
printf("ok ");
|
|
@@ -348,7 +350,8 @@
|
|
diag_7031_D24_T24(int fd, struct dev_vpd *vpd, int se, int verbose)
|
|
{
|
|
struct pearl_diag_page2 dp;
|
|
- int failure = 0, rc, encl_id;
|
|
+ int failure = 0, encl_id;
|
|
+ __attribute__((unused)) int rc;
|
|
int buf_len = sizeof(dp);
|
|
int ps1, ps2, fan1, fan2, fan3, rpt, vpd_card;
|
|
|
|
diff -urN ppc64-diag-2.4.2/rtas_errd/ela.c ppc64-diag-2.4.2_/rtas_errd/ela.c
|
|
--- ppc64-diag-2.4.2/rtas_errd/ela.c 2009-05-21 23:33:07.000000000 +0200
|
|
+++ ppc64-diag-2.4.2_/rtas_errd/ela.c 2012-02-15 18:44:36.870078704 +0100
|
|
@@ -1787,7 +1787,7 @@
|
|
int class;
|
|
int ext_epow;
|
|
int ext_epow_nofan;
|
|
- int fan_num;
|
|
+ __attribute__((unused)) int fan_num;
|
|
|
|
/*
|
|
* The following EPOW error logs found in CHRP, Ver. 1
|
|
diff -urN ppc64-diag-2.4.2/rtas_errd/epow.c ppc64-diag-2.4.2_/rtas_errd/epow.c
|
|
--- ppc64-diag-2.4.2/rtas_errd/epow.c 2010-02-27 02:14:00.000000000 +0100
|
|
+++ ppc64-diag-2.4.2_/rtas_errd/epow.c 2012-02-15 18:48:42.460078703 +0100
|
|
@@ -48,7 +48,7 @@
|
|
void
|
|
epow_timer_handler(int sig, siginfo_t siginfo, void *context)
|
|
{
|
|
- int rc, state;
|
|
+ int __attribute__((unused)) rc, state;
|
|
struct itimerval tv;
|
|
|
|
if (time_remaining <= 0) {
|
|
@@ -149,7 +149,7 @@
|
|
struct rtas_epow_scn *epow;
|
|
struct itimerval tv;
|
|
char *event_type;
|
|
- int rc, state;
|
|
+ int __attribute__((unused)) rc, state;
|
|
|
|
/*
|
|
* Check the sensor state; this will be used to ensure
|
|
@@ -371,7 +371,7 @@
|
|
{
|
|
pid_t child;
|
|
char *childargs[2];
|
|
- int rc, current_status;
|
|
+ int __attribute__((unused)) rc, current_status;
|
|
|
|
/*
|
|
* Dissect the EPOW extended error information;
|
|
diff -urN ppc64-diag-2.4.2/rtas_errd/files.c ppc64-diag-2.4.2_/rtas_errd/files.c
|
|
--- ppc64-diag-2.4.2/rtas_errd/files.c 2009-06-27 01:20:43.000000000 +0200
|
|
+++ ppc64-diag-2.4.2_/rtas_errd/files.c 2012-02-15 18:43:59.950079214 +0100
|
|
@@ -161,7 +161,7 @@
|
|
{
|
|
struct stat sbuf;
|
|
char *tmp;
|
|
- int fd, len;
|
|
+ int fd, __attribute__((unused)) len;
|
|
int i;
|
|
|
|
if (scenario_file == NULL)
|
|
diff -urN ppc64-diag-2.4.2/rtas_errd/guard.c ppc64-diag-2.4.2_/rtas_errd/guard.c
|
|
--- ppc64-diag-2.4.2/rtas_errd/guard.c 2009-06-27 01:20:43.000000000 +0200
|
|
+++ ppc64-diag-2.4.2_/rtas_errd/guard.c 2012-02-15 18:46:45.870082813 +0100
|
|
@@ -40,7 +40,7 @@
|
|
unsigned int value, int wait)
|
|
{
|
|
pid_t child;
|
|
- int status, rc;
|
|
+ int status, __attribute__((unused)) rc;
|
|
char capacity[6], quant_str[5];
|
|
char *drmgr_args[] = {DRMGR_PROGRAM_NOPATH, "-r", "-c", NULL,
|
|
NULL, NULL, NULL, NULL, NULL};
|
|
@@ -368,7 +368,7 @@
|
|
static void
|
|
guard_spcpu(struct event *event, int ent_loss)
|
|
{
|
|
- int n_cpus, rc, quant, ent_cap;
|
|
+ int n_cpus, __attribute__((unused)) rc = 0, quant, ent_cap;
|
|
int min_ent_cap = d_cfg.min_entitled_capacity;
|
|
|
|
/*
|