diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-18 16:42:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-18 16:42:06 -0500 |
| commit | 143c9054949436cb05e468439dc5e46231f33d09 (patch) | |
| tree | c2e972d8188fb1b36368e9acb5b6b59466c9d903 /arch/arm/kernel/traps.c | |
| parent | 0b6807034791160d5e584138943d2daea765436d (diff) | |
| parent | 35eecf052250f663f07a4cded7d3503fd1b50729 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/macvtap.c
Both minor merge hassles, simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/kernel/traps.c')
| -rw-r--r-- | arch/arm/kernel/traps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index dbf0923e8d76..7940241f0576 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
| @@ -509,9 +509,10 @@ static inline int | |||
| 509 | __do_cache_op(unsigned long start, unsigned long end) | 509 | __do_cache_op(unsigned long start, unsigned long end) |
| 510 | { | 510 | { |
| 511 | int ret; | 511 | int ret; |
| 512 | unsigned long chunk = PAGE_SIZE; | ||
| 513 | 512 | ||
| 514 | do { | 513 | do { |
| 514 | unsigned long chunk = min(PAGE_SIZE, end - start); | ||
| 515 | |||
| 515 | if (signal_pending(current)) { | 516 | if (signal_pending(current)) { |
| 516 | struct thread_info *ti = current_thread_info(); | 517 | struct thread_info *ti = current_thread_info(); |
| 517 | 518 | ||