diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 15:50:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 15:50:13 +1100 |
| commit | 0747f7716e6bf96483922904ee14936353865c52 (patch) | |
| tree | fde20e508d2671990f77686e0e7e968f8fdb9921 /drivers/staging/ramzswap/ramzswap_drv.h | |
| parent | e5befd178b2168a6e538fd118cc11be34fadabdc (diff) | |
| parent | bf2ac280f2478de0aed46e851060d3c0fce3674b (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/ramzswap/ramzswap_drv.h')
| -rw-r--r-- | drivers/staging/ramzswap/ramzswap_drv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/ramzswap/ramzswap_drv.h b/drivers/staging/ramzswap/ramzswap_drv.h index a6ea240935b6..7ba98bfee2d6 100644 --- a/drivers/staging/ramzswap/ramzswap_drv.h +++ b/drivers/staging/ramzswap/ramzswap_drv.h @@ -102,7 +102,7 @@ struct table { u16 offset; u8 count; /* object ref count (not yet used) */ u8 flags; -} __attribute__((aligned(4)));; +} __attribute__((aligned(4))); /* * Swap extent information in case backing swap is a regular @@ -121,8 +121,8 @@ struct ramzswap_stats { #if defined(CONFIG_RAMZSWAP_STATS) u64 num_reads; /* failed + successful */ u64 num_writes; /* --do-- */ - u64 failed_reads; /* can happen when memory is too low */ - u64 failed_writes; /* should NEVER! happen */ + u64 failed_reads; /* should NEVER! happen */ + u64 failed_writes; /* can happen when memory is too low */ u64 invalid_io; /* non-swap I/O requests */ u32 pages_zero; /* no. of zero filled pages */ u32 pages_stored; /* no. of pages currently stored */ |