Changeset 777 for GPL/trunk/include/linux

Timestamp:

Apr 21, 2025, 7:17:25 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• include/linux/cleanup.h (copied) (copied from GPL/branches/uniaud32-exp/include/linux/cleanup.h )
• include/linux/compiler.h (modified) (1 diff)
• include/linux/ctype.h (modified) (1 diff)
• include/linux/device.h (modified) (1 diff)
• include/linux/export.h (modified) (1 diff)
• include/linux/kernel.h (modified) (2 diffs)
• include/linux/module.h (modified) (1 diff)
• include/linux/pci_ids.h (modified) (7 diffs)
• include/linux/pm.h (modified) (2 diffs)
• include/linux/string.h (modified) (1 diff)
• include/linux/sysfs.h (modified) (1 diff)
• include/linux/unaligned.h (copied) (copied from GPL/branches/uniaud32-exp/include/linux/unaligned.h )

GPL/trunk/include/linux/compiler.h

@@ -16 +16 @@
 
 #define __GNUC__  3
+
+#define __counted_by(member)
+#define __free(x)
+
+/* Indirect macros required for expanded argument pasting, eg. __LINE__. */
+#define ___PASTE(a,b) a##b
+#define __PASTE(a,b) ___PASTE(a,b)
+
+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
 
 #ifndef __ASSEMBLY__

GPL/trunk/include/linux/ctype.h

@@ -1 +1 @@
 #ifndef _LINUX_CTYPE_H
 #define _LINUX_CTYPE_H
-
+_WCRTLINK extern int isdigit(int c);
 #include <ctype.h>
 _WCRTLINK extern int    tolower(int);
+
 #endif /* _LINUX_CTYPE_H */

GPL/trunk/include/linux/device.h

@@ -120 +120 @@
         const char              *dev_name;
         int (*match)(struct device *dev, struct device_driver *drv);
-        int (*uevent)(struct device *dev, struct kobj_uevent_env *env);
+        int (*uevent)(const struct device *dev, struct kobj_uevent_env *env);
         int (*probe)(struct device *dev);
         int (*remove)(struct device *dev);

GPL/trunk/include/linux/export.h

@@ -6 +6 @@
 #define EXPORT_SYMBOL(a)
 #define EXPORT_SYMBOL_GPL(a)
+#define EXPORT_SYMBOL_NS(a, b)
+#define EXPORT_SYMBOL_NS_GPL(a, b)
 
 #endif /* _LINUX_EXPORT_H */

GPL/trunk/include/linux/kernel.h

@@ -113 +113 @@
 
 char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
+int vscnprintf(char *buf, size_t size, const char *fmt, va_list args);
 extern int hex_to_bin(char ch);
 #define __ALIGN_MASK(x, mask)   __ALIGN_KERNEL_MASK((x), (mask))
@@ -128 +129 @@
 
 _WCRTLINK extern int    sscanf( const char *__s, const char *__format, ... );
-
+typedef void *acpi_handle;      /* Actually a ptr to a NS Node */
+typedef
+void (*acpi_notify_handler) (acpi_handle device, u32 value, void *context);
 #endif

GPL/trunk/include/linux/module.h

@@ -116 +116 @@
         char name[MODULE_NAME_LEN];
 };
+#define MODULE_IMPORT_NS(x)
 #endif /* _LINUX_MODULE_H */

GPL/trunk/include/linux/pci_ids.h

@@ -584 +584 @@
 #define PCI_DEVICE_ID_AMD_1AH_M70H_DF_F3 0x12bb
 #define PCI_DEVICE_ID_AMD_MI200_DF_F3   0x14d3
+#define PCI_DEVICE_ID_AMD_MI300_DF_F3   0x152b
 #define PCI_DEVICE_ID_AMD_VANGOGH_USB   0x163a
 #define PCI_DEVICE_ID_AMD_CNB17H_F3     0x1703
@@ -2589 +2590 @@
 #define PCI_VENDOR_ID_REDHAT            0x1b36
 
+#define PCI_VENDOR_ID_WCHIC             0x1c00
+#define PCI_DEVICE_ID_WCHIC_CH382_0S1P  0x3050
+#define PCI_DEVICE_ID_WCHIC_CH382_2S1P  0x3250
+#define PCI_DEVICE_ID_WCHIC_CH382_2S    0x3253
+
 #define PCI_VENDOR_ID_SILICOM_DENMARK   0x1c2c
 
@@ -2602 +2608 @@
 #define PCI_VENDOR_ID_HYGON             0x1d94
 
+#define PCI_VENDOR_ID_META              0x1d9b
+
 #define PCI_VENDOR_ID_FUNGIBLE          0x1dad
 
@@ -2608 +2616 @@
 #define PCI_VENDOR_ID_TEKRAM            0x1de1
 #define PCI_DEVICE_ID_TEKRAM_DC290      0xdc29
+
+#define PCI_VENDOR_ID_ALIBABA           0x1ded
+
+#define PCI_VENDOR_ID_CXL               0x1e98
 
 #define PCI_VENDOR_ID_TEHUTI            0x1fc9
@@ -2636 +2648 @@
 #define PCI_VENDOR_ID_AKS               0x416c
 #define PCI_DEVICE_ID_AKS_ALADDINCARD   0x0100
+
+#define PCI_VENDOR_ID_WCHCN             0x4348
+#define PCI_DEVICE_ID_WCHCN_CH353_4S    0x3453
+#define PCI_DEVICE_ID_WCHCN_CH353_2S1PF 0x5046
+#define PCI_DEVICE_ID_WCHCN_CH353_1S1P  0x5053
+#define PCI_DEVICE_ID_WCHCN_CH353_2S1P  0x7053
 
 #define PCI_VENDOR_ID_ACCESSIO          0x494f
@@ -2703 +2721 @@
 #define PCI_DEVICE_ID_INTEL_82815_CGC   0x1132
 #define PCI_DEVICE_ID_INTEL_SST_TNG     0x119a
+#define PCI_DEVICE_ID_INTEL_DSA_GNRD    0x11fb
+#define PCI_DEVICE_ID_INTEL_DSA_DMR     0x1212
+#define PCI_DEVICE_ID_INTEL_IAA_DMR     0x1216
 #define PCI_DEVICE_ID_INTEL_82092AA_0   0x1221
 #define PCI_DEVICE_ID_INTEL_82437       0x122d
@@ -3112 +3133 @@
 #define PCI_DEVICE_ID_INTEL_HDA_LNL_P   0xa828
 #define PCI_DEVICE_ID_INTEL_S21152BB    0xb152
+#define PCI_DEVICE_ID_INTEL_HDA_BMG     0xe2f7
+#define PCI_DEVICE_ID_INTEL_HDA_PTL_H   0xe328
+#define PCI_DEVICE_ID_INTEL_HDA_PTL     0xe428
 #define PCI_DEVICE_ID_INTEL_HDA_CML_R   0xf0c8
 #define PCI_DEVICE_ID_INTEL_HDA_RKL_S   0xf1c8

GPL/trunk/include/linux/pm.h

@@ -291 +291 @@
         .restore = resume_fn,
 
+#define SYSTEM_SLEEP_PM_OPS SET_SYSTEM_SLEEP_PM_OPS
 /*
  * Use this if you want to use the same suspend and resume callbacks for suspend
@@ -349 +350 @@
 #define PMSG_RESTORE    0
 #define pm_sleep_ptr(_ptr) _ptr
+
+#define pm_ptr(_ptr) _ptr
+
 #endif /* _LINUX_PM_H */

GPL/trunk/include/linux/string.h

@@ -33 +33 @@
 ssize_t strscpy(char *dest, const char *src, size_t count);
 extern bool sysfs_streq(const char *s1, const char *s2);
-
 #endif
 

GPL/trunk/include/linux/sysfs.h

@@ -2 +2 @@
 #define _LINUX_SYSFS_H
 #include <linux/types.h>
+
+int sysfs_emit(char *buf, const char *fmt, ...);
+int sysfs_emit_at(char *buf, int at, const char *fmt, ...);
 
 struct attribute {