Commit 98555239 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-6.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC fixes from Vineet Gupta:

 - fix for Page Table mem leak

 - defconfig updates

 - misc other fixes

* tag 'arc-6.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: mm: fix leakage of memory allocated for PTE
  arc: update config files
  arc: iounmap() arg is volatile
  arc: dts: Harmonize EHCI/OHCI DT nodes name
  ARC: bitops: Change __fls to return unsigned long
  ARC: Fix comment typo
  ARC: Fix comment typo
parents 4dc12f37 4fd9df10

arch/arc/boot/dts/axc003.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -103,11 +103,11 @@ 
			dma-coherent;

		};



		ehci@40000 {

		usb@40000 {

			dma-coherent;

		};



		ohci@60000 {

		usb@60000 {

			dma-coherent;

		};

arch/arc/boot/dts/axc003_idu.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -110,11 +110,11 @@ 
			dma-coherent;

		};



		ehci@40000 {

		usb@40000 {

			dma-coherent;

		};



		ohci@60000 {

		usb@60000 {

			dma-coherent;

		};

arch/arc/boot/dts/axs10x_mb.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -87,13 +87,13 @@ 
			mac-address = [00 00 00 00 00 00]; /* Filled in by U-Boot */

		};



		ehci@40000 {

		usb@40000 {

			compatible = "generic-ehci";

			reg = < 0x40000 0x100 >;

			interrupts = < 8 >;

		};



		ohci@60000 {

		usb@60000 {

			compatible = "generic-ohci";

			reg = < 0x60000 0x100 >;

			interrupts = < 8 >;

arch/arc/boot/dts/hsdk.dts

+2 −2
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ 
			};

		};



		ohci@60000 {

		usb@60000 {

			compatible = "snps,hsdk-v1.0-ohci", "generic-ohci";

			reg = <0x60000 0x100>;

			interrupts = <15>;
@@ -242,7 +242,7 @@ 
			dma-coherent;

		};



		ehci@40000 {

		usb@40000 {

			compatible = "snps,hsdk-v1.0-ehci", "generic-ehci";

			reg = <0x40000 0x100>;

			interrupts = <15>;

arch/arc/boot/dts/vdk_axs10x_mb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
			clock-names = "stmmaceth";

		};



		ehci@40000 {

		usb@40000 {

			compatible = "generic-ehci";

			reg = < 0x40000 0x100 >;

			interrupts = < 8 >;