Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262013
b: refs/heads/master
c: b94fdd0
h: refs/heads/master
i:
  262011: c22544e
v: v3
  • Loading branch information
Matthew Garrett authored and Tony Luck committed Jul 22, 2011
1 parent c24aa80 commit 1464142
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 56280682ceeef74b692b3e21d1872049eea7c887
refs/heads/master: b94fdd077eef5e6cab56836bf62695b497946716
8 changes: 4 additions & 4 deletions trunk/drivers/acpi/apei/erst.c
Original file line number Diff line number Diff line change
Expand Up @@ -933,8 +933,8 @@ static int erst_open_pstore(struct pstore_info *psi);
static int erst_close_pstore(struct pstore_info *psi);
static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,
struct timespec *time, struct pstore_info *psi);
static u64 erst_writer(enum pstore_type_id type, int part, size_t size,
struct pstore_info *psi);
static u64 erst_writer(enum pstore_type_id type, unsigned int part,
size_t size, struct pstore_info *psi);
static int erst_clearer(enum pstore_type_id type, u64 id,
struct pstore_info *psi);

Expand Down Expand Up @@ -1040,8 +1040,8 @@ static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,
return (rc < 0) ? rc : (len - sizeof(*rcd));
}

static u64 erst_writer(enum pstore_type_id type, int part, size_t size,
struct pstore_info *psi)
static u64 erst_writer(enum pstore_type_id type, unsigned int part,
size_t size, struct pstore_info *psi)
{
struct cper_pstore_record *rcd = (struct cper_pstore_record *)
(erst_info.buf - sizeof(*rcd));
Expand Down
3 changes: 2 additions & 1 deletion trunk/fs/pstore/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ static void pstore_dump(struct kmsg_dumper *dumper,
unsigned long size, total = 0;
char *dst, *why;
u64 id;
int hsize, part = 1;
int hsize;
unsigned int part = 1;

if (reason < ARRAY_SIZE(reason_str))
why = reason_str[reason];
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/pstore.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct pstore_info {
int (*close)(struct pstore_info *psi);
ssize_t (*read)(u64 *id, enum pstore_type_id *type,
struct timespec *time, struct pstore_info *psi);
u64 (*write)(enum pstore_type_id type, int part,
u64 (*write)(enum pstore_type_id type, unsigned int part,
size_t size, struct pstore_info *psi);
int (*erase)(enum pstore_type_id type, u64 id,
struct pstore_info *psi);
Expand Down

0 comments on commit 1464142

Please sign in to comment.