diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-06 21:44:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-06 21:44:57 -0400 |
| commit | 13dfb3fa494361ea9a5950f27c9cd8b06d28c04f (patch) | |
| tree | 1bf30874f57c6c6b21160a10282191fcd0868055 /arch/parisc/mm/fault.c | |
| parent | 05bb520376af2c5146d3c44832c22ec3bb54d778 (diff) | |
| parent | 33920f1ec5bf47c5c0a1d2113989bdd9dfb3fae9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Just minor overlapping changes in the conflicts here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/parisc/mm/fault.c')
| -rw-r--r-- | arch/parisc/mm/fault.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index 6dd4669ce7a5..adbd5e2144a3 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c | |||
| @@ -66,6 +66,7 @@ parisc_acctyp(unsigned long code, unsigned int inst) | |||
| 66 | case 0x30000000: /* coproc2 */ | 66 | case 0x30000000: /* coproc2 */ |
| 67 | if (bit22set(inst)) | 67 | if (bit22set(inst)) |
| 68 | return VM_WRITE; | 68 | return VM_WRITE; |
| 69 | /* fall through */ | ||
| 69 | 70 | ||
| 70 | case 0x0: /* indexed/memory management */ | 71 | case 0x0: /* indexed/memory management */ |
| 71 | if (bit22set(inst)) { | 72 | if (bit22set(inst)) { |