Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164500
b: refs/heads/master
c: d5a6d17
h: refs/heads/master
v: v3
  • Loading branch information
Roel Kluin authored and Linus Torvalds committed Sep 22, 2009
1 parent facc1bc commit f54d747
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 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: 1f693665457539e919856149151b7a7e96550d70
refs/heads/master: d5a6d1739526ed8c383db3dabc232bc15603439a
5 changes: 2 additions & 3 deletions trunk/arch/m32r/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ static int ptrace_read_user(struct task_struct *tsk, unsigned long off,
struct user * dummy = NULL;
#endif

if ((off & 3) || (off < 0) || (off > sizeof(struct user) - 3))
if ((off & 3) || off > sizeof(struct user) - 3)
return -EIO;

off >>= 2;
Expand Down Expand Up @@ -139,8 +139,7 @@ static int ptrace_write_user(struct task_struct *tsk, unsigned long off,
struct user * dummy = NULL;
#endif

if ((off & 3) || off < 0 ||
off > sizeof(struct user) - 3)
if ((off & 3) || off > sizeof(struct user) - 3)
return -EIO;

off >>= 2;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/m32r/kernel/smpboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
if (!physid_isset(phys_id, phys_cpu_present_map))
continue;

if ((max_cpus >= 0) && (max_cpus <= cpucount + 1))
if (max_cpus <= cpucount + 1)
continue;

do_boot_cpu(phys_id);
Expand Down

0 comments on commit f54d747

Please sign in to comment.