tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k update from Geert Uytterhoeven.

* 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Use for_each_sg()
m68k/defconfig: Update defconfigs for v4.1-rc6

Linus Torvalds df687709 407a2c72

+84 -31
+6 -2
arch/m68k/configs/amiga_defconfig
··· 177 177 CONFIG_IP_SET_HASH_NETIFACE=m 178 178 CONFIG_IP_SET_LIST_SET=m 179 179 CONFIG_NF_CONNTRACK_IPV4=m 180 - CONFIG_NF_LOG_ARP=m 181 180 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 182 181 CONFIG_NF_TABLES_ARP=m 182 + CONFIG_NF_LOG_ARP=m 183 183 CONFIG_NFT_CHAIN_NAT_IPV4=m 184 184 CONFIG_NFT_MASQ_IPV4=m 185 185 CONFIG_NFT_REDIR_IPV4=m ··· 267 267 CONFIG_BATMAN_ADV_NC=y 268 268 CONFIG_BATMAN_ADV_MCAST=y 269 269 CONFIG_NETLINK_DIAG=m 270 + CONFIG_MPLS=y 270 271 CONFIG_NET_MPLS_GSO=m 272 + CONFIG_MPLS_ROUTING=m 271 273 # CONFIG_WIRELESS is not set 272 274 # CONFIG_UEVENT_HELPER is not set 273 275 CONFIG_DEVTMPFS=y ··· 287 285 CONFIG_BLK_DEV_DRBD=m 288 286 CONFIG_BLK_DEV_NBD=m 289 287 CONFIG_BLK_DEV_RAM=y 288 + CONFIG_BLK_DEV_PMEM=m 290 289 CONFIG_CDROM_PKTCDVD=m 291 290 CONFIG_ATA_OVER_ETH=m 292 291 CONFIG_DUMMY_IRQ=m ··· 327 324 CONFIG_DM_ZERO=m 328 325 CONFIG_DM_MULTIPATH=m 329 326 CONFIG_DM_UEVENT=y 327 + CONFIG_DM_LOG_WRITES=m 330 328 CONFIG_TARGET_CORE=m 331 329 CONFIG_TCM_IBLOCK=m 332 330 CONFIG_TCM_FILEIO=m ··· 352 348 CONFIG_A2065=y 353 349 CONFIG_ARIADNE=y 354 350 # CONFIG_NET_VENDOR_ARC is not set 351 + # CONFIG_NET_CADENCE is not set 355 352 # CONFIG_NET_VENDOR_BROADCOM is not set 356 353 # CONFIG_NET_VENDOR_CIRRUS is not set 357 354 # CONFIG_NET_VENDOR_HP is not set ··· 419 414 CONFIG_HIDRAW=y 420 415 CONFIG_UHID=m 421 416 # CONFIG_HID_GENERIC is not set 422 - # CONFIG_HID_PLANTRONICS is not set 423 417 # CONFIG_USB_SUPPORT is not set 424 418 CONFIG_RTC_CLASS=y 425 419 CONFIG_RTC_DRV_MSM6242=m
+6 -2
arch/m68k/configs/apollo_defconfig
··· 175 175 CONFIG_IP_SET_HASH_NETIFACE=m 176 176 CONFIG_IP_SET_LIST_SET=m 177 177 CONFIG_NF_CONNTRACK_IPV4=m 178 - CONFIG_NF_LOG_ARP=m 179 178 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 180 179 CONFIG_NF_TABLES_ARP=m 180 + CONFIG_NF_LOG_ARP=m 181 181 CONFIG_NFT_CHAIN_NAT_IPV4=m 182 182 CONFIG_NFT_MASQ_IPV4=m 183 183 CONFIG_NFT_REDIR_IPV4=m ··· 265 265 CONFIG_BATMAN_ADV_NC=y 266 266 CONFIG_BATMAN_ADV_MCAST=y 267 267 CONFIG_NETLINK_DIAG=m 268 + CONFIG_MPLS=y 268 269 CONFIG_NET_MPLS_GSO=m 270 + CONFIG_MPLS_ROUTING=m 269 271 # CONFIG_WIRELESS is not set 270 272 # CONFIG_UEVENT_HELPER is not set 271 273 CONFIG_DEVTMPFS=y ··· 279 277 CONFIG_BLK_DEV_DRBD=m 280 278 CONFIG_BLK_DEV_NBD=m 281 279 CONFIG_BLK_DEV_RAM=y 280 + CONFIG_BLK_DEV_PMEM=m 282 281 CONFIG_CDROM_PKTCDVD=m 283 282 CONFIG_ATA_OVER_ETH=m 284 283 CONFIG_DUMMY_IRQ=m ··· 309 306 CONFIG_DM_ZERO=m 310 307 CONFIG_DM_MULTIPATH=m 311 308 CONFIG_DM_UEVENT=y 309 + CONFIG_DM_LOG_WRITES=m 312 310 CONFIG_TARGET_CORE=m 313 311 CONFIG_TCM_IBLOCK=m 314 312 CONFIG_TCM_FILEIO=m ··· 331 327 CONFIG_NETCONSOLE_DYNAMIC=y 332 328 CONFIG_VETH=m 333 329 # CONFIG_NET_VENDOR_ARC is not set 330 + # CONFIG_NET_CADENCE is not set 334 331 # CONFIG_NET_VENDOR_BROADCOM is not set 335 332 # CONFIG_NET_VENDOR_INTEL is not set 336 333 # CONFIG_NET_VENDOR_MARVELL is not set ··· 380 375 CONFIG_HIDRAW=y 381 376 CONFIG_UHID=m 382 377 # CONFIG_HID_GENERIC is not set 383 - # CONFIG_HID_PLANTRONICS is not set 384 378 # CONFIG_USB_SUPPORT is not set 385 379 CONFIG_RTC_CLASS=y 386 380 CONFIG_RTC_DRV_GENERIC=m
+6 -2
arch/m68k/configs/atari_defconfig
··· 175 175 CONFIG_IP_SET_HASH_NETIFACE=m 176 176 CONFIG_IP_SET_LIST_SET=m 177 177 CONFIG_NF_CONNTRACK_IPV4=m 178 - CONFIG_NF_LOG_ARP=m 179 178 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 180 179 CONFIG_NF_TABLES_ARP=m 180 + CONFIG_NF_LOG_ARP=m 181 181 CONFIG_NFT_CHAIN_NAT_IPV4=m 182 182 CONFIG_NFT_MASQ_IPV4=m 183 183 CONFIG_NFT_REDIR_IPV4=m ··· 265 265 CONFIG_BATMAN_ADV_NC=y 266 266 CONFIG_BATMAN_ADV_MCAST=y 267 267 CONFIG_NETLINK_DIAG=m 268 + CONFIG_MPLS=y 268 269 CONFIG_NET_MPLS_GSO=m 270 + CONFIG_MPLS_ROUTING=m 269 271 # CONFIG_WIRELESS is not set 270 272 # CONFIG_UEVENT_HELPER is not set 271 273 CONFIG_DEVTMPFS=y ··· 283 281 CONFIG_BLK_DEV_DRBD=m 284 282 CONFIG_BLK_DEV_NBD=m 285 283 CONFIG_BLK_DEV_RAM=y 284 + CONFIG_BLK_DEV_PMEM=m 286 285 CONFIG_CDROM_PKTCDVD=m 287 286 CONFIG_ATA_OVER_ETH=m 288 287 CONFIG_DUMMY_IRQ=m ··· 318 315 CONFIG_DM_ZERO=m 319 316 CONFIG_DM_MULTIPATH=m 320 317 CONFIG_DM_UEVENT=y 318 + CONFIG_DM_LOG_WRITES=m 321 319 CONFIG_TARGET_CORE=m 322 320 CONFIG_TCM_IBLOCK=m 323 321 CONFIG_TCM_FILEIO=m ··· 341 337 CONFIG_VETH=m 342 338 CONFIG_ATARILANCE=y 343 339 # CONFIG_NET_VENDOR_ARC is not set 340 + # CONFIG_NET_CADENCE is not set 344 341 # CONFIG_NET_VENDOR_BROADCOM is not set 345 342 # CONFIG_NET_VENDOR_INTEL is not set 346 343 # CONFIG_NET_VENDOR_MARVELL is not set ··· 396 391 CONFIG_HID=m 397 392 CONFIG_HIDRAW=y 398 393 CONFIG_UHID=m 399 - # CONFIG_HID_PLANTRONICS is not set 400 394 CONFIG_RTC_CLASS=y 401 395 CONFIG_RTC_DRV_GENERIC=m 402 396 # CONFIG_IOMMU_SUPPORT is not set
+6 -2
arch/m68k/configs/bvme6000_defconfig
··· 173 173 CONFIG_IP_SET_HASH_NETIFACE=m 174 174 CONFIG_IP_SET_LIST_SET=m 175 175 CONFIG_NF_CONNTRACK_IPV4=m 176 - CONFIG_NF_LOG_ARP=m 177 176 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 178 177 CONFIG_NF_TABLES_ARP=m 178 + CONFIG_NF_LOG_ARP=m 179 179 CONFIG_NFT_CHAIN_NAT_IPV4=m 180 180 CONFIG_NFT_MASQ_IPV4=m 181 181 CONFIG_NFT_REDIR_IPV4=m ··· 263 263 CONFIG_BATMAN_ADV_NC=y 264 264 CONFIG_BATMAN_ADV_MCAST=y 265 265 CONFIG_NETLINK_DIAG=m 266 + CONFIG_MPLS=y 266 267 CONFIG_NET_MPLS_GSO=m 268 + CONFIG_MPLS_ROUTING=m 267 269 # CONFIG_WIRELESS is not set 268 270 # CONFIG_UEVENT_HELPER is not set 269 271 CONFIG_DEVTMPFS=y ··· 277 275 CONFIG_BLK_DEV_DRBD=m 278 276 CONFIG_BLK_DEV_NBD=m 279 277 CONFIG_BLK_DEV_RAM=y 278 + CONFIG_BLK_DEV_PMEM=m 280 279 CONFIG_CDROM_PKTCDVD=m 281 280 CONFIG_ATA_OVER_ETH=m 282 281 CONFIG_DUMMY_IRQ=m ··· 308 305 CONFIG_DM_ZERO=m 309 306 CONFIG_DM_MULTIPATH=m 310 307 CONFIG_DM_UEVENT=y 308 + CONFIG_DM_LOG_WRITES=m 311 309 CONFIG_TARGET_CORE=m 312 310 CONFIG_TCM_IBLOCK=m 313 311 CONFIG_TCM_FILEIO=m ··· 330 326 CONFIG_NETCONSOLE_DYNAMIC=y 331 327 CONFIG_VETH=m 332 328 # CONFIG_NET_VENDOR_ARC is not set 329 + # CONFIG_NET_CADENCE is not set 333 330 # CONFIG_NET_VENDOR_BROADCOM is not set 334 331 CONFIG_BVME6000_NET=y 335 332 # CONFIG_NET_VENDOR_MARVELL is not set ··· 374 369 CONFIG_HIDRAW=y 375 370 CONFIG_UHID=m 376 371 # CONFIG_HID_GENERIC is not set 377 - # CONFIG_HID_PLANTRONICS is not set 378 372 # CONFIG_USB_SUPPORT is not set 379 373 CONFIG_RTC_CLASS=y 380 374 CONFIG_RTC_DRV_GENERIC=m
+6 -2
arch/m68k/configs/hp300_defconfig
··· 175 175 CONFIG_IP_SET_HASH_NETIFACE=m 176 176 CONFIG_IP_SET_LIST_SET=m 177 177 CONFIG_NF_CONNTRACK_IPV4=m 178 - CONFIG_NF_LOG_ARP=m 179 178 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 180 179 CONFIG_NF_TABLES_ARP=m 180 + CONFIG_NF_LOG_ARP=m 181 181 CONFIG_NFT_CHAIN_NAT_IPV4=m 182 182 CONFIG_NFT_MASQ_IPV4=m 183 183 CONFIG_NFT_REDIR_IPV4=m ··· 265 265 CONFIG_BATMAN_ADV_NC=y 266 266 CONFIG_BATMAN_ADV_MCAST=y 267 267 CONFIG_NETLINK_DIAG=m 268 + CONFIG_MPLS=y 268 269 CONFIG_NET_MPLS_GSO=m 270 + CONFIG_MPLS_ROUTING=m 269 271 # CONFIG_WIRELESS is not set 270 272 # CONFIG_UEVENT_HELPER is not set 271 273 CONFIG_DEVTMPFS=y ··· 279 277 CONFIG_BLK_DEV_DRBD=m 280 278 CONFIG_BLK_DEV_NBD=m 281 279 CONFIG_BLK_DEV_RAM=y 280 + CONFIG_BLK_DEV_PMEM=m 282 281 CONFIG_CDROM_PKTCDVD=m 283 282 CONFIG_ATA_OVER_ETH=m 284 283 CONFIG_DUMMY_IRQ=m ··· 309 306 CONFIG_DM_ZERO=m 310 307 CONFIG_DM_MULTIPATH=m 311 308 CONFIG_DM_UEVENT=y 309 + CONFIG_DM_LOG_WRITES=m 312 310 CONFIG_TARGET_CORE=m 313 311 CONFIG_TCM_IBLOCK=m 314 312 CONFIG_TCM_FILEIO=m ··· 332 328 CONFIG_VETH=m 333 329 CONFIG_HPLANCE=y 334 330 # CONFIG_NET_VENDOR_ARC is not set 331 + # CONFIG_NET_CADENCE is not set 335 332 # CONFIG_NET_VENDOR_BROADCOM is not set 336 333 # CONFIG_NET_VENDOR_INTEL is not set 337 334 # CONFIG_NET_VENDOR_MARVELL is not set ··· 383 378 CONFIG_HIDRAW=y 384 379 CONFIG_UHID=m 385 380 # CONFIG_HID_GENERIC is not set 386 - # CONFIG_HID_PLANTRONICS is not set 387 381 # CONFIG_USB_SUPPORT is not set 388 382 CONFIG_RTC_CLASS=y 389 383 CONFIG_RTC_DRV_GENERIC=m
+6 -2
arch/m68k/configs/mac_defconfig
··· 174 174 CONFIG_IP_SET_HASH_NETIFACE=m 175 175 CONFIG_IP_SET_LIST_SET=m 176 176 CONFIG_NF_CONNTRACK_IPV4=m 177 - CONFIG_NF_LOG_ARP=m 178 177 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 179 178 CONFIG_NF_TABLES_ARP=m 179 + CONFIG_NF_LOG_ARP=m 180 180 CONFIG_NFT_CHAIN_NAT_IPV4=m 181 181 CONFIG_NFT_MASQ_IPV4=m 182 182 CONFIG_NFT_REDIR_IPV4=m ··· 267 267 CONFIG_BATMAN_ADV_NC=y 268 268 CONFIG_BATMAN_ADV_MCAST=y 269 269 CONFIG_NETLINK_DIAG=m 270 + CONFIG_MPLS=y 270 271 CONFIG_NET_MPLS_GSO=m 272 + CONFIG_MPLS_ROUTING=m 271 273 # CONFIG_WIRELESS is not set 272 274 # CONFIG_UEVENT_HELPER is not set 273 275 CONFIG_DEVTMPFS=y ··· 282 280 CONFIG_BLK_DEV_DRBD=m 283 281 CONFIG_BLK_DEV_NBD=m 284 282 CONFIG_BLK_DEV_RAM=y 283 + CONFIG_BLK_DEV_PMEM=m 285 284 CONFIG_CDROM_PKTCDVD=m 286 285 CONFIG_ATA_OVER_ETH=m 287 286 CONFIG_DUMMY_IRQ=m ··· 318 315 CONFIG_DM_ZERO=m 319 316 CONFIG_DM_MULTIPATH=m 320 317 CONFIG_DM_UEVENT=y 318 + CONFIG_DM_LOG_WRITES=m 321 319 CONFIG_TARGET_CORE=m 322 320 CONFIG_TCM_IBLOCK=m 323 321 CONFIG_TCM_FILEIO=m ··· 348 344 CONFIG_VETH=m 349 345 CONFIG_MACMACE=y 350 346 # CONFIG_NET_VENDOR_ARC is not set 347 + # CONFIG_NET_CADENCE is not set 351 348 # CONFIG_NET_VENDOR_BROADCOM is not set 352 349 CONFIG_MAC89x0=y 353 350 # CONFIG_NET_VENDOR_INTEL is not set ··· 405 400 CONFIG_HIDRAW=y 406 401 CONFIG_UHID=m 407 402 # CONFIG_HID_GENERIC is not set 408 - # CONFIG_HID_PLANTRONICS is not set 409 403 # CONFIG_USB_SUPPORT is not set 410 404 CONFIG_RTC_CLASS=y 411 405 CONFIG_RTC_DRV_GENERIC=m
+6 -2
arch/m68k/configs/multi_defconfig
··· 184 184 CONFIG_IP_SET_HASH_NETIFACE=m 185 185 CONFIG_IP_SET_LIST_SET=m 186 186 CONFIG_NF_CONNTRACK_IPV4=m 187 - CONFIG_NF_LOG_ARP=m 188 187 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 189 188 CONFIG_NF_TABLES_ARP=m 189 + CONFIG_NF_LOG_ARP=m 190 190 CONFIG_NFT_CHAIN_NAT_IPV4=m 191 191 CONFIG_NFT_MASQ_IPV4=m 192 192 CONFIG_NFT_REDIR_IPV4=m ··· 277 277 CONFIG_BATMAN_ADV_NC=y 278 278 CONFIG_BATMAN_ADV_MCAST=y 279 279 CONFIG_NETLINK_DIAG=m 280 + CONFIG_MPLS=y 280 281 CONFIG_NET_MPLS_GSO=m 282 + CONFIG_MPLS_ROUTING=m 281 283 # CONFIG_WIRELESS is not set 282 284 # CONFIG_UEVENT_HELPER is not set 283 285 CONFIG_DEVTMPFS=y ··· 301 299 CONFIG_BLK_DEV_DRBD=m 302 300 CONFIG_BLK_DEV_NBD=m 303 301 CONFIG_BLK_DEV_RAM=y 302 + CONFIG_BLK_DEV_PMEM=m 304 303 CONFIG_CDROM_PKTCDVD=m 305 304 CONFIG_ATA_OVER_ETH=m 306 305 CONFIG_DUMMY_IRQ=m ··· 351 348 CONFIG_DM_ZERO=m 352 349 CONFIG_DM_MULTIPATH=m 353 350 CONFIG_DM_UEVENT=y 351 + CONFIG_DM_LOG_WRITES=m 354 352 CONFIG_TARGET_CORE=m 355 353 CONFIG_TCM_IBLOCK=m 356 354 CONFIG_TCM_FILEIO=m ··· 388 384 CONFIG_SUN3LANCE=y 389 385 CONFIG_MACMACE=y 390 386 # CONFIG_NET_VENDOR_ARC is not set 387 + # CONFIG_NET_CADENCE is not set 391 388 # CONFIG_NET_VENDOR_BROADCOM is not set 392 389 CONFIG_MAC89x0=y 393 390 # CONFIG_NET_VENDOR_HP is not set ··· 473 468 CONFIG_HIDRAW=y 474 469 CONFIG_UHID=m 475 470 # CONFIG_HID_GENERIC is not set 476 - # CONFIG_HID_PLANTRONICS is not set 477 471 # CONFIG_USB_SUPPORT is not set 478 472 CONFIG_RTC_CLASS=y 479 473 CONFIG_RTC_DRV_MSM6242=m
+6 -2
arch/m68k/configs/mvme147_defconfig
··· 172 172 CONFIG_IP_SET_HASH_NETIFACE=m 173 173 CONFIG_IP_SET_LIST_SET=m 174 174 CONFIG_NF_CONNTRACK_IPV4=m 175 - CONFIG_NF_LOG_ARP=m 176 175 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 177 176 CONFIG_NF_TABLES_ARP=m 177 + CONFIG_NF_LOG_ARP=m 178 178 CONFIG_NFT_CHAIN_NAT_IPV4=m 179 179 CONFIG_NFT_MASQ_IPV4=m 180 180 CONFIG_NFT_REDIR_IPV4=m ··· 262 262 CONFIG_BATMAN_ADV_NC=y 263 263 CONFIG_BATMAN_ADV_MCAST=y 264 264 CONFIG_NETLINK_DIAG=m 265 + CONFIG_MPLS=y 265 266 CONFIG_NET_MPLS_GSO=m 267 + CONFIG_MPLS_ROUTING=m 266 268 # CONFIG_WIRELESS is not set 267 269 # CONFIG_UEVENT_HELPER is not set 268 270 CONFIG_DEVTMPFS=y ··· 276 274 CONFIG_BLK_DEV_DRBD=m 277 275 CONFIG_BLK_DEV_NBD=m 278 276 CONFIG_BLK_DEV_RAM=y 277 + CONFIG_BLK_DEV_PMEM=m 279 278 CONFIG_CDROM_PKTCDVD=m 280 279 CONFIG_ATA_OVER_ETH=m 281 280 CONFIG_DUMMY_IRQ=m ··· 307 304 CONFIG_DM_ZERO=m 308 305 CONFIG_DM_MULTIPATH=m 309 306 CONFIG_DM_UEVENT=y 307 + CONFIG_DM_LOG_WRITES=m 310 308 CONFIG_TARGET_CORE=m 311 309 CONFIG_TCM_IBLOCK=m 312 310 CONFIG_TCM_FILEIO=m ··· 330 326 CONFIG_VETH=m 331 327 CONFIG_MVME147_NET=y 332 328 # CONFIG_NET_VENDOR_ARC is not set 329 + # CONFIG_NET_CADENCE is not set 333 330 # CONFIG_NET_VENDOR_BROADCOM is not set 334 331 # CONFIG_NET_VENDOR_INTEL is not set 335 332 # CONFIG_NET_VENDOR_MARVELL is not set ··· 374 369 CONFIG_HIDRAW=y 375 370 CONFIG_UHID=m 376 371 # CONFIG_HID_GENERIC is not set 377 - # CONFIG_HID_PLANTRONICS is not set 378 372 # CONFIG_USB_SUPPORT is not set 379 373 CONFIG_RTC_CLASS=y 380 374 CONFIG_RTC_DRV_GENERIC=m
+6 -2
arch/m68k/configs/mvme16x_defconfig
··· 173 173 CONFIG_IP_SET_HASH_NETIFACE=m 174 174 CONFIG_IP_SET_LIST_SET=m 175 175 CONFIG_NF_CONNTRACK_IPV4=m 176 - CONFIG_NF_LOG_ARP=m 177 176 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 178 177 CONFIG_NF_TABLES_ARP=m 178 + CONFIG_NF_LOG_ARP=m 179 179 CONFIG_NFT_CHAIN_NAT_IPV4=m 180 180 CONFIG_NFT_MASQ_IPV4=m 181 181 CONFIG_NFT_REDIR_IPV4=m ··· 263 263 CONFIG_BATMAN_ADV_NC=y 264 264 CONFIG_BATMAN_ADV_MCAST=y 265 265 CONFIG_NETLINK_DIAG=m 266 + CONFIG_MPLS=y 266 267 CONFIG_NET_MPLS_GSO=m 268 + CONFIG_MPLS_ROUTING=m 267 269 # CONFIG_WIRELESS is not set 268 270 # CONFIG_UEVENT_HELPER is not set 269 271 CONFIG_DEVTMPFS=y ··· 277 275 CONFIG_BLK_DEV_DRBD=m 278 276 CONFIG_BLK_DEV_NBD=m 279 277 CONFIG_BLK_DEV_RAM=y 278 + CONFIG_BLK_DEV_PMEM=m 280 279 CONFIG_CDROM_PKTCDVD=m 281 280 CONFIG_ATA_OVER_ETH=m 282 281 CONFIG_DUMMY_IRQ=m ··· 308 305 CONFIG_DM_ZERO=m 309 306 CONFIG_DM_MULTIPATH=m 310 307 CONFIG_DM_UEVENT=y 308 + CONFIG_DM_LOG_WRITES=m 311 309 CONFIG_TARGET_CORE=m 312 310 CONFIG_TCM_IBLOCK=m 313 311 CONFIG_TCM_FILEIO=m ··· 330 326 CONFIG_NETCONSOLE_DYNAMIC=y 331 327 CONFIG_VETH=m 332 328 # CONFIG_NET_VENDOR_ARC is not set 329 + # CONFIG_NET_CADENCE is not set 333 330 # CONFIG_NET_VENDOR_BROADCOM is not set 334 331 CONFIG_MVME16x_NET=y 335 332 # CONFIG_NET_VENDOR_MARVELL is not set ··· 374 369 CONFIG_HIDRAW=y 375 370 CONFIG_UHID=m 376 371 # CONFIG_HID_GENERIC is not set 377 - # CONFIG_HID_PLANTRONICS is not set 378 372 # CONFIG_USB_SUPPORT is not set 379 373 CONFIG_RTC_CLASS=y 380 374 CONFIG_RTC_DRV_GENERIC=m
+6 -2
arch/m68k/configs/q40_defconfig
··· 173 173 CONFIG_IP_SET_HASH_NETIFACE=m 174 174 CONFIG_IP_SET_LIST_SET=m 175 175 CONFIG_NF_CONNTRACK_IPV4=m 176 - CONFIG_NF_LOG_ARP=m 177 176 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 178 177 CONFIG_NF_TABLES_ARP=m 178 + CONFIG_NF_LOG_ARP=m 179 179 CONFIG_NFT_CHAIN_NAT_IPV4=m 180 180 CONFIG_NFT_MASQ_IPV4=m 181 181 CONFIG_NFT_REDIR_IPV4=m ··· 263 263 CONFIG_BATMAN_ADV_NC=y 264 264 CONFIG_BATMAN_ADV_MCAST=y 265 265 CONFIG_NETLINK_DIAG=m 266 + CONFIG_MPLS=y 266 267 CONFIG_NET_MPLS_GSO=m 268 + CONFIG_MPLS_ROUTING=m 267 269 # CONFIG_WIRELESS is not set 268 270 # CONFIG_UEVENT_HELPER is not set 269 271 CONFIG_DEVTMPFS=y ··· 280 278 CONFIG_BLK_DEV_DRBD=m 281 279 CONFIG_BLK_DEV_NBD=m 282 280 CONFIG_BLK_DEV_RAM=y 281 + CONFIG_BLK_DEV_PMEM=m 283 282 CONFIG_CDROM_PKTCDVD=m 284 283 CONFIG_ATA_OVER_ETH=m 285 284 CONFIG_DUMMY_IRQ=m ··· 314 311 CONFIG_DM_ZERO=m 315 312 CONFIG_DM_MULTIPATH=m 316 313 CONFIG_DM_UEVENT=y 314 + CONFIG_DM_LOG_WRITES=m 317 315 CONFIG_TARGET_CORE=m 318 316 CONFIG_TCM_IBLOCK=m 319 317 CONFIG_TCM_FILEIO=m ··· 338 334 # CONFIG_NET_VENDOR_3COM is not set 339 335 # CONFIG_NET_VENDOR_AMD is not set 340 336 # CONFIG_NET_VENDOR_ARC is not set 337 + # CONFIG_NET_CADENCE is not set 341 338 # CONFIG_NET_VENDOR_BROADCOM is not set 342 339 # CONFIG_NET_VENDOR_CIRRUS is not set 343 340 # CONFIG_NET_VENDOR_HP is not set ··· 395 390 CONFIG_HIDRAW=y 396 391 CONFIG_UHID=m 397 392 # CONFIG_HID_GENERIC is not set 398 - # CONFIG_HID_PLANTRONICS is not set 399 393 # CONFIG_USB_SUPPORT is not set 400 394 CONFIG_RTC_CLASS=y 401 395 CONFIG_RTC_DRV_GENERIC=m
+6 -2
arch/m68k/configs/sun3_defconfig
··· 170 170 CONFIG_IP_SET_HASH_NETIFACE=m 171 171 CONFIG_IP_SET_LIST_SET=m 172 172 CONFIG_NF_CONNTRACK_IPV4=m 173 - CONFIG_NF_LOG_ARP=m 174 173 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 175 174 CONFIG_NF_TABLES_ARP=m 175 + CONFIG_NF_LOG_ARP=m 176 176 CONFIG_NFT_CHAIN_NAT_IPV4=m 177 177 CONFIG_NFT_MASQ_IPV4=m 178 178 CONFIG_NFT_REDIR_IPV4=m ··· 260 260 CONFIG_BATMAN_ADV_NC=y 261 261 CONFIG_BATMAN_ADV_MCAST=y 262 262 CONFIG_NETLINK_DIAG=m 263 + CONFIG_MPLS=y 263 264 CONFIG_NET_MPLS_GSO=m 265 + CONFIG_MPLS_ROUTING=m 264 266 # CONFIG_WIRELESS is not set 265 267 # CONFIG_UEVENT_HELPER is not set 266 268 CONFIG_DEVTMPFS=y ··· 274 272 CONFIG_BLK_DEV_DRBD=m 275 273 CONFIG_BLK_DEV_NBD=m 276 274 CONFIG_BLK_DEV_RAM=y 275 + CONFIG_BLK_DEV_PMEM=m 277 276 CONFIG_CDROM_PKTCDVD=m 278 277 CONFIG_ATA_OVER_ETH=m 279 278 CONFIG_DUMMY_IRQ=m ··· 305 302 CONFIG_DM_ZERO=m 306 303 CONFIG_DM_MULTIPATH=m 307 304 CONFIG_DM_UEVENT=y 305 + CONFIG_DM_LOG_WRITES=m 308 306 CONFIG_TARGET_CORE=m 309 307 CONFIG_TCM_IBLOCK=m 310 308 CONFIG_TCM_FILEIO=m ··· 328 324 CONFIG_VETH=m 329 325 CONFIG_SUN3LANCE=y 330 326 # CONFIG_NET_VENDOR_ARC is not set 327 + # CONFIG_NET_CADENCE is not set 331 328 CONFIG_SUN3_82586=y 332 329 # CONFIG_NET_VENDOR_MARVELL is not set 333 330 # CONFIG_NET_VENDOR_MICREL is not set ··· 375 370 CONFIG_HIDRAW=y 376 371 CONFIG_UHID=m 377 372 # CONFIG_HID_GENERIC is not set 378 - # CONFIG_HID_PLANTRONICS is not set 379 373 # CONFIG_USB_SUPPORT is not set 380 374 CONFIG_RTC_CLASS=y 381 375 CONFIG_RTC_DRV_GENERIC=m
+6 -2
arch/m68k/configs/sun3x_defconfig
··· 170 170 CONFIG_IP_SET_HASH_NETIFACE=m 171 171 CONFIG_IP_SET_LIST_SET=m 172 172 CONFIG_NF_CONNTRACK_IPV4=m 173 - CONFIG_NF_LOG_ARP=m 174 173 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 175 174 CONFIG_NF_TABLES_ARP=m 175 + CONFIG_NF_LOG_ARP=m 176 176 CONFIG_NFT_CHAIN_NAT_IPV4=m 177 177 CONFIG_NFT_MASQ_IPV4=m 178 178 CONFIG_NFT_REDIR_IPV4=m ··· 260 260 CONFIG_BATMAN_ADV_NC=y 261 261 CONFIG_BATMAN_ADV_MCAST=y 262 262 CONFIG_NETLINK_DIAG=m 263 + CONFIG_MPLS=y 263 264 CONFIG_NET_MPLS_GSO=m 265 + CONFIG_MPLS_ROUTING=m 264 266 # CONFIG_WIRELESS is not set 265 267 # CONFIG_UEVENT_HELPER is not set 266 268 CONFIG_DEVTMPFS=y ··· 274 272 CONFIG_BLK_DEV_DRBD=m 275 273 CONFIG_BLK_DEV_NBD=m 276 274 CONFIG_BLK_DEV_RAM=y 275 + CONFIG_BLK_DEV_PMEM=m 277 276 CONFIG_CDROM_PKTCDVD=m 278 277 CONFIG_ATA_OVER_ETH=m 279 278 CONFIG_DUMMY_IRQ=m ··· 305 302 CONFIG_DM_ZERO=m 306 303 CONFIG_DM_MULTIPATH=m 307 304 CONFIG_DM_UEVENT=y 305 + CONFIG_DM_LOG_WRITES=m 308 306 CONFIG_TARGET_CORE=m 309 307 CONFIG_TCM_IBLOCK=m 310 308 CONFIG_TCM_FILEIO=m ··· 328 324 CONFIG_VETH=m 329 325 CONFIG_SUN3LANCE=y 330 326 # CONFIG_NET_VENDOR_ARC is not set 327 + # CONFIG_NET_CADENCE is not set 331 328 # CONFIG_NET_VENDOR_BROADCOM is not set 332 329 # CONFIG_NET_VENDOR_INTEL is not set 333 330 # CONFIG_NET_VENDOR_MARVELL is not set ··· 375 370 CONFIG_HIDRAW=y 376 371 CONFIG_UHID=m 377 372 # CONFIG_HID_GENERIC is not set 378 - # CONFIG_HID_PLANTRONICS is not set 379 373 # CONFIG_USB_SUPPORT is not set 380 374 CONFIG_RTC_CLASS=y 381 375 CONFIG_RTC_DRV_GENERIC=m
+12 -7
arch/m68k/kernel/dma.c
··· 120 120 } 121 121 EXPORT_SYMBOL(dma_sync_single_for_device); 122 122 123 - void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents, 124 - enum dma_data_direction dir) 123 + void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist, 124 + int nents, enum dma_data_direction dir) 125 125 { 126 126 int i; 127 + struct scatterlist *sg; 127 128 128 - for (i = 0; i < nents; sg++, i++) 129 - dma_sync_single_for_device(dev, sg->dma_address, sg->length, dir); 129 + for_each_sg(sglist, sg, nents, i) { 130 + dma_sync_single_for_device(dev, sg->dma_address, sg->length, 131 + dir); 132 + } 130 133 } 131 134 EXPORT_SYMBOL(dma_sync_sg_for_device); 132 135 ··· 154 151 } 155 152 EXPORT_SYMBOL(dma_map_page); 156 153 157 - int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, 154 + int dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents, 158 155 enum dma_data_direction dir) 159 156 { 160 157 int i; 158 + struct scatterlist *sg; 161 159 162 - for (i = 0; i < nents; sg++, i++) { 160 + for_each_sg(sglist, sg, nents, i) { 163 161 sg->dma_address = sg_phys(sg); 164 - dma_sync_single_for_device(dev, sg->dma_address, sg->length, dir); 162 + dma_sync_single_for_device(dev, sg->dma_address, sg->length, 163 + dir); 165 164 } 166 165 return nents; 167 166 }