Merge tag 'm68k-for-v4.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

+1 -1

arch/m68k/coldfire/head.S

··· 288 288 #endif 289 289 290 290 /* 291 - * Assember start up done, start code proper. 291 + * Assembler start up done, start code proper. 292 292 */ 293 293 jsr start_kernel /* start Linux kernel */ 294 294

+1 -1

arch/m68k/coldfire/m5272.c

··· 111 111 /***************************************************************************/ 112 112 113 113 /* 114 - * Some 5272 based boards have the FEC ethernet diectly connected to 114 + * Some 5272 based boards have the FEC ethernet directly connected to 115 115 * an ethernet switch. In this case we need to use the fixed phy type, 116 116 * and we need to declare it early in boot. 117 117 */

+1 -1

arch/m68k/coldfire/pci.c

··· 42 42 43 43 /* 44 44 * We need to be carefull probing on bus 0 (directly connected to host 45 - * bridge). We should only acccess the well defined possible devices in 45 + * bridge). We should only access the well defined possible devices in 46 46 * use, ignore aliases and the like. 47 47 */ 48 48 static unsigned char mcf_host_slot2sid[32] = {

+4

arch/m68k/configs/amiga_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 360 359 CONFIG_IPVLAN=m 361 360 CONFIG_VXLAN=m 362 361 CONFIG_GENEVE=m 362 + CONFIG_GTP=m 363 363 CONFIG_MACSEC=m 364 364 CONFIG_NETCONSOLE=m 365 365 CONFIG_NETCONSOLE_DYNAMIC=y ··· 555 553 CONFIG_TEST_KSTRTOX=m 556 554 CONFIG_TEST_PRINTF=m 557 555 CONFIG_TEST_BITMAP=m 556 + CONFIG_TEST_UUID=m 558 557 CONFIG_TEST_RHASHTABLE=m 558 + CONFIG_TEST_HASH=m 559 559 CONFIG_TEST_LKM=m 560 560 CONFIG_TEST_USER_COPY=m 561 561 CONFIG_TEST_BPF=m

+4

arch/m68k/configs/apollo_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 342 341 CONFIG_IPVLAN=m 343 342 CONFIG_VXLAN=m 344 343 CONFIG_GENEVE=m 344 + CONFIG_GTP=m 345 345 CONFIG_MACSEC=m 346 346 CONFIG_NETCONSOLE=m 347 347 CONFIG_NETCONSOLE_DYNAMIC=y ··· 514 512 CONFIG_TEST_KSTRTOX=m 515 513 CONFIG_TEST_PRINTF=m 516 514 CONFIG_TEST_BITMAP=m 515 + CONFIG_TEST_UUID=m 517 516 CONFIG_TEST_RHASHTABLE=m 517 + CONFIG_TEST_HASH=m 518 518 CONFIG_TEST_LKM=m 519 519 CONFIG_TEST_USER_COPY=m 520 520 CONFIG_TEST_BPF=m

+4

arch/m68k/configs/atari_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 351 350 CONFIG_IPVLAN=m 352 351 CONFIG_VXLAN=m 353 352 CONFIG_GENEVE=m 353 + CONFIG_GTP=m 354 354 CONFIG_MACSEC=m 355 355 CONFIG_NETCONSOLE=m 356 356 CONFIG_NETCONSOLE_DYNAMIC=y ··· 535 533 CONFIG_TEST_KSTRTOX=m 536 534 CONFIG_TEST_PRINTF=m 537 535 CONFIG_TEST_BITMAP=m 536 + CONFIG_TEST_UUID=m 538 537 CONFIG_TEST_RHASHTABLE=m 538 + CONFIG_TEST_HASH=m 539 539 CONFIG_TEST_LKM=m 540 540 CONFIG_TEST_USER_COPY=m 541 541 CONFIG_TEST_BPF=m

+4

arch/m68k/configs/bvme6000_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 341 340 CONFIG_IPVLAN=m 342 341 CONFIG_VXLAN=m 343 342 CONFIG_GENEVE=m 343 + CONFIG_GTP=m 344 344 CONFIG_MACSEC=m 345 345 CONFIG_NETCONSOLE=m 346 346 CONFIG_NETCONSOLE_DYNAMIC=y ··· 506 504 CONFIG_TEST_KSTRTOX=m 507 505 CONFIG_TEST_PRINTF=m 508 506 CONFIG_TEST_BITMAP=m 507 + CONFIG_TEST_UUID=m 509 508 CONFIG_TEST_RHASHTABLE=m 509 + CONFIG_TEST_HASH=m 510 510 CONFIG_TEST_LKM=m 511 511 CONFIG_TEST_USER_COPY=m 512 512 CONFIG_TEST_BPF=m

+4

arch/m68k/configs/hp300_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 342 341 CONFIG_IPVLAN=m 343 342 CONFIG_VXLAN=m 344 343 CONFIG_GENEVE=m 344 + CONFIG_GTP=m 345 345 CONFIG_MACSEC=m 346 346 CONFIG_NETCONSOLE=m 347 347 CONFIG_NETCONSOLE_DYNAMIC=y ··· 516 514 CONFIG_TEST_KSTRTOX=m 517 515 CONFIG_TEST_PRINTF=m 518 516 CONFIG_TEST_BITMAP=m 517 + CONFIG_TEST_UUID=m 519 518 CONFIG_TEST_RHASHTABLE=m 519 + CONFIG_TEST_HASH=m 520 520 CONFIG_TEST_LKM=m 521 521 CONFIG_TEST_USER_COPY=m 522 522 CONFIG_TEST_BPF=m

+4

arch/m68k/configs/mac_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 358 357 CONFIG_IPVLAN=m 359 358 CONFIG_VXLAN=m 360 359 CONFIG_GENEVE=m 360 + CONFIG_GTP=m 361 361 CONFIG_MACSEC=m 362 362 CONFIG_NETCONSOLE=m 363 363 CONFIG_NETCONSOLE_DYNAMIC=y ··· 538 536 CONFIG_TEST_KSTRTOX=m 539 537 CONFIG_TEST_PRINTF=m 540 538 CONFIG_TEST_BITMAP=m 539 + CONFIG_TEST_UUID=m 541 540 CONFIG_TEST_RHASHTABLE=m 541 + CONFIG_TEST_HASH=m 542 542 CONFIG_TEST_LKM=m 543 543 CONFIG_TEST_USER_COPY=m 544 544 CONFIG_TEST_BPF=m

+4

arch/m68k/configs/multi_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 391 390 CONFIG_IPVLAN=m 392 391 CONFIG_VXLAN=m 393 392 CONFIG_GENEVE=m 393 + CONFIG_GTP=m 394 394 CONFIG_MACSEC=m 395 395 CONFIG_NETCONSOLE=m 396 396 CONFIG_NETCONSOLE_DYNAMIC=y ··· 618 616 CONFIG_TEST_KSTRTOX=m 619 617 CONFIG_TEST_PRINTF=m 620 618 CONFIG_TEST_BITMAP=m 619 + CONFIG_TEST_UUID=m 621 620 CONFIG_TEST_RHASHTABLE=m 621 + CONFIG_TEST_HASH=m 622 622 CONFIG_TEST_LKM=m 623 623 CONFIG_TEST_USER_COPY=m 624 624 CONFIG_TEST_BPF=m

+4

arch/m68k/configs/mvme147_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 340 339 CONFIG_IPVLAN=m 341 340 CONFIG_VXLAN=m 342 341 CONFIG_GENEVE=m 342 + CONFIG_GTP=m 343 343 CONFIG_MACSEC=m 344 344 CONFIG_NETCONSOLE=m 345 345 CONFIG_NETCONSOLE_DYNAMIC=y ··· 506 504 CONFIG_TEST_KSTRTOX=m 507 505 CONFIG_TEST_PRINTF=m 508 506 CONFIG_TEST_BITMAP=m 507 + CONFIG_TEST_UUID=m 509 508 CONFIG_TEST_RHASHTABLE=m 509 + CONFIG_TEST_HASH=m 510 510 CONFIG_TEST_LKM=m 511 511 CONFIG_TEST_USER_COPY=m 512 512 CONFIG_TEST_BPF=m

+4

arch/m68k/configs/mvme16x_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 341 340 CONFIG_IPVLAN=m 342 341 CONFIG_VXLAN=m 343 342 CONFIG_GENEVE=m 343 + CONFIG_GTP=m 344 344 CONFIG_MACSEC=m 345 345 CONFIG_NETCONSOLE=m 346 346 CONFIG_NETCONSOLE_DYNAMIC=y ··· 506 504 CONFIG_TEST_KSTRTOX=m 507 505 CONFIG_TEST_PRINTF=m 508 506 CONFIG_TEST_BITMAP=m 507 + CONFIG_TEST_UUID=m 509 508 CONFIG_TEST_RHASHTABLE=m 509 + CONFIG_TEST_HASH=m 510 510 CONFIG_TEST_LKM=m 511 511 CONFIG_TEST_USER_COPY=m 512 512 CONFIG_TEST_BPF=m

+4

arch/m68k/configs/q40_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 347 346 CONFIG_IPVLAN=m 348 347 CONFIG_VXLAN=m 349 348 CONFIG_GENEVE=m 349 + CONFIG_GTP=m 350 350 CONFIG_MACSEC=m 351 351 CONFIG_NETCONSOLE=m 352 352 CONFIG_NETCONSOLE_DYNAMIC=y ··· 529 527 CONFIG_TEST_KSTRTOX=m 530 528 CONFIG_TEST_PRINTF=m 531 529 CONFIG_TEST_BITMAP=m 530 + CONFIG_TEST_UUID=m 532 531 CONFIG_TEST_RHASHTABLE=m 532 + CONFIG_TEST_HASH=m 533 533 CONFIG_TEST_LKM=m 534 534 CONFIG_TEST_USER_COPY=m 535 535 CONFIG_TEST_BPF=m

+4

arch/m68k/configs/sun3_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 338 337 CONFIG_IPVLAN=m 339 338 CONFIG_VXLAN=m 340 339 CONFIG_GENEVE=m 340 + CONFIG_GTP=m 341 341 CONFIG_MACSEC=m 342 342 CONFIG_NETCONSOLE=m 343 343 CONFIG_NETCONSOLE_DYNAMIC=y ··· 508 506 CONFIG_TEST_KSTRTOX=m 509 507 CONFIG_TEST_PRINTF=m 510 508 CONFIG_TEST_BITMAP=m 509 + CONFIG_TEST_UUID=m 511 510 CONFIG_TEST_RHASHTABLE=m 511 + CONFIG_TEST_HASH=m 512 512 CONFIG_TEST_LKM=m 513 513 CONFIG_TEST_USER_COPY=m 514 514 CONFIG_TEST_BPF=m

+4

arch/m68k/configs/sun3x_defconfig

··· 9 9 # CONFIG_PID_NS is not set 10 10 # CONFIG_NET_NS is not set 11 11 CONFIG_BLK_DEV_INITRD=y 12 + CONFIG_CC_OPTIMIZE_FOR_SIZE=y 12 13 CONFIG_USERFAULTFD=y 13 14 CONFIG_SLAB=y 14 15 CONFIG_MODULES=y ··· 338 337 CONFIG_IPVLAN=m 339 338 CONFIG_VXLAN=m 340 339 CONFIG_GENEVE=m 340 + CONFIG_GTP=m 341 341 CONFIG_MACSEC=m 342 342 CONFIG_NETCONSOLE=m 343 343 CONFIG_NETCONSOLE_DYNAMIC=y ··· 508 506 CONFIG_TEST_KSTRTOX=m 509 507 CONFIG_TEST_PRINTF=m 510 508 CONFIG_TEST_BITMAP=m 509 + CONFIG_TEST_UUID=m 511 510 CONFIG_TEST_RHASHTABLE=m 511 + CONFIG_TEST_HASH=m 512 512 CONFIG_TEST_LKM=m 513 513 CONFIG_TEST_USER_COPY=m 514 514 CONFIG_TEST_BPF=m

+4 -4

arch/m68k/ifpsp060/src/fpsp.S

··· 10191 10191 xdnrm_sd: 10192 10192 mov.l %a1,-(%sp) 10193 10193 tst.b LOCAL_EX(%a0) # is denorm pos or neg? 10194 - smi.b %d1 # set d0 accodingly 10194 + smi.b %d1 # set d0 accordingly 10195 10195 bsr.l unf_sub 10196 10196 mov.l (%sp)+,%a1 10197 10197 xdnrm_exit: ··· 10990 10990 # routines where an instruction is selected by an index into 10991 10991 # a large jump table corresponding to a given instruction which 10992 10992 # has been decoded. Flow continues here where we now decode 10993 - # further accoding to the source operand type. 10993 + # further according to the source operand type. 10994 10994 # 10995 10995 10996 10996 global fsinh ··· 23196 23196 # 23197 23197 # 1. Branch on the sign of the adjusted exponent. 23198 23198 # 2p.(positive exp) 23199 - # 2. Check M16 and the digits in lwords 2 and 3 in decending order. 23199 + # 2. Check M16 and the digits in lwords 2 and 3 in descending order. 23200 23200 # 3. Add one for each zero encountered until a non-zero digit. 23201 23201 # 4. Subtract the count from the exp. 23202 23202 # 5. Check if the exp has crossed zero in #3 above; make the exp abs 23203 23203 # and set SE. 23204 23204 # 6. Multiply the mantissa by 10**count. 23205 23205 # 2n.(negative exp) 23206 - # 2. Check the digits in lwords 3 and 2 in decending order. 23206 + # 2. Check the digits in lwords 3 and 2 in descending order. 23207 23207 # 3. Add one for each zero encountered until a non-zero digit. 23208 23208 # 4. Add the count to the exp. 23209 23209 # 5. Check if the exp has crossed zero in #3 above; clear SE.

+2 -2

arch/m68k/ifpsp060/src/pfpsp.S

··· 13156 13156 # 13157 13157 # 1. Branch on the sign of the adjusted exponent. 13158 13158 # 2p.(positive exp) 13159 - # 2. Check M16 and the digits in lwords 2 and 3 in decending order. 13159 + # 2. Check M16 and the digits in lwords 2 and 3 in descending order. 13160 13160 # 3. Add one for each zero encountered until a non-zero digit. 13161 13161 # 4. Subtract the count from the exp. 13162 13162 # 5. Check if the exp has crossed zero in #3 above; make the exp abs 13163 13163 # and set SE. 13164 13164 # 6. Multiply the mantissa by 10**count. 13165 13165 # 2n.(negative exp) 13166 - # 2. Check the digits in lwords 3 and 2 in decending order. 13166 + # 2. Check the digits in lwords 3 and 2 in descending order. 13167 13167 # 3. Add one for each zero encountered until a non-zero digit. 13168 13168 # 4. Add the count to the exp. 13169 13169 # 5. Check if the exp has crossed zero in #3 above; clear SE.

+1 -1

arch/m68k/include/asm/dma.h

··· 18 18 * AUG/22/2000 : added support for 32-bit Dual-Address-Mode (K) 2000 19 19 * Oliver Kamphenkel (O.Kamphenkel@tu-bs.de) 20 20 * 21 - * AUG/25/2000 : addad support for 8, 16 and 32-bit Single-Address-Mode (K)2000 21 + * AUG/25/2000 : added support for 8, 16 and 32-bit Single-Address-Mode (K)2000 22 22 * Oliver Kamphenkel (O.Kamphenkel@tu-bs.de) 23 23 * 24 24 * APR/18/2002 : added proper support for MCF5272 DMA controller.

+2 -2

arch/m68k/include/asm/m525xsim.h

··· 123 123 /* 124 124 * I2C module. 125 125 */ 126 - #define MCFI2C_BASE0 (MCF_MBAR + 0x280) /* Base addreess I2C0 */ 126 + #define MCFI2C_BASE0 (MCF_MBAR + 0x280) /* Base address I2C0 */ 127 127 #define MCFI2C_SIZE0 0x20 /* Register set size */ 128 128 129 - #define MCFI2C_BASE1 (MCF_MBAR2 + 0x440) /* Base addreess I2C1 */ 129 + #define MCFI2C_BASE1 (MCF_MBAR2 + 0x440) /* Base address I2C1 */ 130 130 #define MCFI2C_SIZE1 0x20 /* Register set size */ 131 131 132 132 /*

+1 -1

arch/m68k/include/asm/mcfmmu.h

··· 38 38 /* 39 39 * MMU Operation register. 40 40 */ 41 - #define MMUOR_UAA 0x00000001 /* Update allocatiom address */ 41 + #define MMUOR_UAA 0x00000001 /* Update allocation address */ 42 42 #define MMUOR_ACC 0x00000002 /* TLB access */ 43 43 #define MMUOR_RD 0x00000004 /* TLB access read */ 44 44 #define MMUOR_WR 0x00000000 /* TLB access write */

+1 -1

arch/m68k/include/asm/q40_master.h

··· 1 1 /* 2 2 * Q40 master Chip Control 3 - * RTC stuff merged for compactnes.. 3 + * RTC stuff merged for compactness. 4 4 */ 5 5 6 6 #ifndef _Q40_MASTER_H

+1 -1

arch/m68k/mac/iop.c

··· 60 60 * 61 61 * The host talks to the IOPs using a rather simple message-passing scheme via 62 62 * a shared memory area in the IOP RAM. Each IOP has seven "channels"; each 63 - * channel is conneced to a specific software driver on the IOP. For example 63 + * channel is connected to a specific software driver on the IOP. For example 64 64 * on the SCC IOP there is one channel for each serial port. Each channel has 65 65 * an incoming and and outgoing message queue with a depth of one. 66 66 *

+1 -1

arch/m68k/math-emu/fp_decode.h

··· 130 130 bfextu %d2{#13,#3},%d0 131 131 .endm 132 132 133 - | decode the 8bit diplacement from the brief extension word 133 + | decode the 8bit displacement from the brief extension word 134 134 .macro fp_decode_disp8 135 135 move.b %d2,%d0 136 136 ext.w %d0

Configure Feed

Configure Feed